Replace test_for properties with explicit dependencies on implementations

As part of simplifying the apex logic in Soong, replace some of the
magic dependencies on implementations vs stubs with explicit dependencies
with a #impl suffix.  This obsoletes the extra apex_avaiable entries
required by b/183882457 and the test_for property.

Bug: 372543712
Test: builds
Flag: EXEMPT refactor
Change-Id: Iafbccd8133729602d3c94bcc519c0933d1548da9

7 files changed, 17 insertions, 69 deletions

diff --git a/compiler/Android.bp b/compiler/Android.bp
index 197a283b55..ce087dacf7 100644
--- a/compiler/Android.bp
+++ b/compiler/Android.bp
@@ -50,7 +50,7 @@ art_cc_defaults {
     shared_libs: [
         "libartbase",
         "libprofile",
-        "libdexfile",
+        "libdexfile#impl",
     ],
     static_libs: ["libelffile"],
     codegen: {
@@ -93,7 +93,7 @@ art_cc_defaults {
     shared_libs: [
         "libartbased",
         "libprofiled",
-        "libdexfiled",
+        "libdexfiled#impl",
     ],
     static_libs: ["libelffiled"],
     codegen: {
@@ -373,10 +373,6 @@ art_cc_library_static {
     ],
     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 libdexfiled.
-        "com.android.art",
     ],
 }
 
diff --git a/libdexfile/Android.bp b/libdexfile/Android.bp
index a7eb1230ba..2abc16feac 100644
--- a/libdexfile/Android.bp
+++ b/libdexfile/Android.bp
@@ -270,11 +270,6 @@ art_cc_library {
     },
     apex_available: [
         "com.android.art.debug",
-        // TODO(b/183882457): This lib doesn't go into the following APEXes, but
-        // apex_available lists need to be the same for internal libs to avoid
-        // stubs, and libartd and libprofiled depend on this.
-        "com.android.art",
-        "test_broken_com.android.art",
     ],
 
     // libdexfiled.so implements the libdexfile.so API in com.android.art.debug.
diff --git a/libnativeloader/Android.bp b/libnativeloader/Android.bp
index 3718f1e3ed..69a45a1935 100644
--- a/libnativeloader/Android.bp
+++ b/libnativeloader/Android.bp
@@ -46,7 +46,7 @@ cc_defaults {
     ],
     export_header_lib_headers: ["libnativeloader-headers"],
     shared_libs: [
-        "libnativebridge",
+        "libnativebridge#impl",
     ],
     target: {
         android: {
@@ -159,10 +159,6 @@ art_cc_test {
         "native_loader_test.cpp",
     ],
 
-    test_for: [
-        "com.android.art",
-        "com.android.art.debug",
-    ],
     test_suites: [
         "general-tests",
         "mts-art",
diff --git a/libprofile/Android.bp b/libprofile/Android.bp
index 0d1e5f7fa7..833ac2e040 100644
--- a/libprofile/Android.bp
+++ b/libprofile/Android.bp
@@ -112,7 +112,7 @@ art_cc_library {
         android: {
             shared_libs: [
                 "libartbase",
-                "libdexfile",
+                "libdexfile#impl",
             ],
         },
         not_windows: {
@@ -149,7 +149,7 @@ art_cc_library {
         android: {
             shared_libs: [
                 "libartbased",
-                "libdexfiled",
+                "libdexfiled#impl",
             ],
         },
         not_windows: {
@@ -167,11 +167,6 @@ art_cc_library {
     },
     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",
-        "test_broken_com.android.art",
     ],
 }
 
diff --git a/odrefresh/Android.bp b/odrefresh/Android.bp
index 53e5f90fa6..530a714dec 100644
--- a/odrefresh/Android.bp
+++ b/odrefresh/Android.bp
@@ -74,7 +74,7 @@ cc_defaults {
     shared_libs: [
         "libarttools",
         "libbase",
-        "libdexfile",
+        "libdexfile#impl",
         "libselinux",
     ],
 }
@@ -169,11 +169,6 @@ art_cc_binary {
     ],
     apex_available: [
         "com.android.art.debug",
-        // TODO(b/183882457): This binary 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 libartd.
-        "com.android.art",
-        "test_broken_com.android.art",
     ],
 }
 
diff --git a/runtime/Android.bp b/runtime/Android.bp
index f93321649b..1c7e9fbcb3 100644
--- a/runtime/Android.bp
+++ b/runtime/Android.bp
@@ -151,9 +151,9 @@ cc_defaults {
         "liblog",
         "liblz4",
         "liblzma", // libelffile(d) dependency; must be repeated here since it's a static lib.
-        "libnativebridge",
-        "libnativeloader",
-        "libsigchain",
+        "libnativebridge#impl",
+        "libnativeloader#impl",
+        "libsigchain#impl",
         "libunwindstack",
     ],
     static_libs: ["libodrstatslog"],
@@ -167,11 +167,11 @@ cc_defaults {
     ],
     shared_libs: [
         "libartbase",
-        "libdexfile",
+        "libdexfile#impl",
         "libprofile",
     ],
     export_shared_lib_headers: [
-        "libdexfile",
+        "libdexfile#impl",
     ],
 }
 
@@ -183,11 +183,11 @@ cc_defaults {
     ],
     shared_libs: [
         "libartbased",
-        "libdexfiled",
+        "libdexfiled#impl",
         "libprofiled",
     ],
     export_shared_lib_headers: [
-        "libdexfiled",
+        "libdexfiled#impl",
     ],
 }
 
@@ -843,10 +843,6 @@ art_cc_library_static {
     defaults: ["libartd-runtime_defaults"],
     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",
     ],
 }
 
@@ -933,11 +929,6 @@ art_cc_library {
     ],
     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",
-        "test_broken_com.android.art",
     ],
 }
 
diff --git a/test/Android.bp b/test/Android.bp
index 784c45a377..a0e2f5980d 100644
--- a/test/Android.bp
+++ b/test/Android.bp
@@ -85,12 +85,6 @@ cc_defaults {
         android_x86_64: {
             relative_install_path: "art/x86_64",
         },
-        android: {
-            test_for: [
-                "com.android.art",
-                "com.android.art.debug",
-            ],
-        },
     },
     // Tests aren't generally included in any APEX, but this is necessary to
     // avoid duplicate install rules for them by making them unavailable to platform.
@@ -110,12 +104,6 @@ art_cc_defaults {
     name: "art_test_internal_library_defaults",
     defaults: ["art_test_defaults"],
     target: {
-        android: {
-            test_for: [
-                "com.android.art",
-                "com.android.art.debug",
-            ],
-        },
         android_arm: {
             relative_install_path: "com.android.art/lib",
         },
@@ -555,7 +543,7 @@ art_cc_test_library {
     defaults: ["libarttest-defaults"],
     shared_libs: [
         "libart",
-        "libdexfile",
+        "libdexfile#impl",
         "libprofile",
         "libartbase",
     ],
@@ -569,7 +557,7 @@ art_cc_test_library {
     ],
     shared_libs: [
         "libartd",
-        "libdexfiled",
+        "libdexfiled#impl",
         "libprofiled",
         "libartbased",
     ],
@@ -783,7 +771,7 @@ art_cc_test_library {
     defaults: ["libtiagent-defaults"],
     shared_libs: [
         "libart",
-        "libdexfile",
+        "libdexfile#impl",
         "libprofile",
         "libartbase",
     ],
@@ -797,7 +785,7 @@ art_cc_test_library {
     ],
     shared_libs: [
         "libartd",
-        "libdexfiled",
+        "libdexfiled#impl",
         "libprofiled",
         "libartbased",
     ],
@@ -1352,10 +1340,6 @@ art_cc_test {
             suffix: "64",
         },
     },
-    test_for: [
-        "com.android.art",
-        "com.android.art.debug",
-    ],
 }
 
 art_cc_test {
@@ -1368,10 +1352,6 @@ art_cc_test {
     ],
     test_suites: ["general-tests"],
     test_config: "art-gtests-target-chroot.xml",
-    test_for: [
-        "com.android.art",
-        "com.android.art.debug",
-    ],
 }
 
 csuite_test {