commit 6b3ffff66b413a5038939c73d5059b9a6ea49712
author Jiyong Park <jiyong@google.com> Tue Apr 21 11:29:53 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Apr 21 11:29:53 2020 +0000
tree 79d8f9693f8b3cfe480a770c3de794e2c575cdbb
parent 7d27d5062a7f328b72022bac0b9ac9f39c5db2e5
parent 1c40a69cc85882562eabc4dcabf74cef54e6a889

Set apex_available property am: eb9e618c70 am: 1c40a69cc8

Change-Id: I10dedbc1722a89230e4a39d45c3e091968aa7f0f

Android.bp

diff --git a/Android.bp b/Android.bp
index 1b6130a..510efa0 100644
--- a/Android.bp
+++ b/Android.bp
@@ -113,6 +113,17 @@
             ],
         },
     },
+    apex_available: [
+        "//apex_available:platform",
+        "com.android.adbd",
+        "com.android.art.debug",
+        "com.android.art.release",
+        "com.android.art.testing",
+        "com.android.bluetooth.updatable",
+        "com.android.conscrypt",
+        "com.android.media",
+        "com.android.resolv",
+    ],
 }
 
 bootstrap_go_package {
@@ -184,7 +195,13 @@
     apex_available: [
         "//apex_available:platform",
         "com.android.adbd",
-        "test_com.android.adbd",
+        "com.android.art.debug",
+        "com.android.art.release",
+        "com.android.art.testing",
+        "com.android.bluetooth.updatable",
+        "com.android.conscrypt",
+        "com.android.media",
+        "com.android.resolv",
     ],
 }
 
@@ -219,7 +236,6 @@
     apex_available: [
         "//apex_available:platform",
         "com.android.neuralnetworks",
-        "test_com.android.neuralnetworks",
     ],
     defaults: [
         "libcrypto_bcm_sources",
@@ -262,7 +278,8 @@
     apex_available: [
         "//apex_available:platform",
         "com.android.adbd",
-        "test_com.android.adbd",
+        "com.android.conscrypt",
+        "com.android.resolv",
     ],
 }