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

1 files changed, 2 insertions, 7 deletions

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",
     ],
 }