commit 137fb1ff1e430e9e86b829b8a89bf06ae3362956
author Jiyong Park <jiyong@google.com> Tue Mar 10 18:31:02 2020 +0900
committer Jiyong Park <jiyong@google.com> Mon Apr 20 16:07:35 2020 +0900
tree b331c743b483c3b6c37e6cc1ae98a01445ca3e03
parent a206b8cbf4f1fcbecde649c62aba42ef2b66620a

Set apex_available property

The marked library(ies) were available to the adbd APEX via the
hand-written whitelist in build/soong/apex/apex.go. Trying to remove the
whitelist by adding apex_available property to the Android.bp of the
libraries.

Exempt-From-Owner-Approval: already +2'ed by the owner (enh)

Bug: 150999716
Bug: 151398197
Test: m
Merged-In: I8b572e3c4e76bd10c0443a6c08b72e9519243ab5
(cherry picked from commit d25bb60e056b2b68aaeead3025d8024eaf8e8b8d)
Change-Id: I8b572e3c4e76bd10c0443a6c08b72e9519243ab5

adb/Android.bp

diff --git a/adb/Android.bp b/adb/Android.bp
index 0af82e1..d365648 100644
--- a/adb/Android.bp
+++ b/adb/Android.bp
@@ -498,6 +498,7 @@
     name: "libadbd",
     defaults: ["adbd_defaults", "host_adbd_supported"],
     recovery_available: true,
+    apex_available: ["com.android.adbd"],
 
     // avoid getting duplicate symbol of android::build::getbuildnumber().
     use_version_lib: false,
@@ -550,6 +551,7 @@
     defaults: ["adbd_defaults", "host_adbd_supported", "libadbd_binary_dependencies"],
     stl: "libc++_static",
     recovery_available: true,
+    apex_available: ["com.android.adbd"],
 
     srcs: [
         "daemon/main.cpp",