commit 697134d1d4f8ecc930d3438db46499aac8c4d191
author Jiyong Park <jiyong@google.com> Mon Mar 23 14:40:50 2020 +0000
committer Jiyong Park <jiyong@google.com> Thu Mar 26 00:23:56 2020 +0000
tree ca8c6e54901c1101473df63e41b91ddd393d4c29
parent 56a712f6c93de93d4257ad50c20cda1a6b9b34da

Revert "Revert "Set apex_available property""

This reverts commit 56a712f6c93de93d4257ad50c20cda1a6b9b34da.

Reason for revert: forward fix is at aosp/1265379

Exempt-From-Owner-Approval: relanding of an already approved CL

Change-Id: I0d93417939d570ce21f105ee4b3bae6414194dbe

adb/Android.bp

diff --git a/adb/Android.bp b/adb/Android.bp
index b879753..5c4ab4a 100644
--- a/adb/Android.bp
+++ b/adb/Android.bp
@@ -526,6 +526,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,
@@ -580,6 +581,7 @@
     defaults: ["adbd_defaults", "host_adbd_supported"],
     stl: "libc++_static",
     recovery_available: true,
+    apex_available: ["com.android.adbd"],
 
     srcs: [
         "daemon/main.cpp",