Fix apex_available lists to avoid APEX stubs between internal libs.

Test: m TARGET_PRODUCT=full TARGET_BUILD_VARIANT=eng \
  out/soong/.intermediates/art/compiler/libartd-compiler/android_arm_armv7-a-neon_shared/unstripped/libartd-compiler.so
Test: mmm art
Bug: 184929782
Bug: 143978909
Bug: 183882457
Change-Id: I6350257ad1fc9dfb7115bff6c2caa1bc4ac86898
diff --git a/libdexfile/Android.bp b/libdexfile/Android.bp
index 8aa287f..3a6cc0d 100644
--- a/libdexfile/Android.bp
+++ b/libdexfile/Android.bp
@@ -228,6 +228,10 @@
     },
     apex_available: [
         "com.android.art.debug",
+        // TODO(b/183882457): This lib doesn't go into com.android.art, but
+        // apex_available lists need to be the same for internal libs to avoid
+        // stubs, and libartd depends on this.
+        "com.android.art",
     ],
 }
 
diff --git a/libprofile/Android.bp b/libprofile/Android.bp
index 50f806e..2edf821 100644
--- a/libprofile/Android.bp
+++ b/libprofile/Android.bp
@@ -175,6 +175,10 @@
     export_shared_lib_headers: ["libbase"],
     apex_available: [
         "com.android.art.debug",
+        // TODO(b/183882457): This lib doesn't go into com.android.art, but
+        // apex_available lists need to be the same for internal libs to avoid
+        // stubs, and libartd depends on this.
+        "com.android.art",
     ],
 }
 
diff --git a/runtime/Android.bp b/runtime/Android.bp
index 5c6e481..33f4040 100644
--- a/runtime/Android.bp
+++ b/runtime/Android.bp
@@ -592,6 +592,10 @@
     ],
     apex_available: [
         "com.android.art.debug",
+        // TODO(b/183882457): This lib doesn't go into com.android.art, but
+        // apex_available lists need to be the same for internal libs to avoid
+        // stubs, and this depends on libsigchain.
+        "com.android.art",
     ],
 }