Explicitly use implementations where necessary for modules in the same apex

The logic that magically determines whether to use stubs or
implementations for modules in the same apex is being removed
to simplify the Soong logic and make the build system easier to
understand.  Explicitly use libdexfile#impl for modules in the
art apex that need the implementation APIs.

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

10 files changed, 15 insertions, 15 deletions

diff --git a/artd/Android.bp b/artd/Android.bp
index 72024c0eec..4e38ce8896 100644
--- a/artd/Android.bp
+++ b/artd/Android.bp
@@ -64,7 +64,7 @@ art_cc_binary {
         "libartservice",
         "libarttools",
         "libbase",
-        "libdexfile",
+        "libdexfile#impl",
     ],
     apex_available: [
         "com.android.art",
diff --git a/dalvikvm/Android.bp b/dalvikvm/Android.bp
index 233a2891f9..1ab408c484 100644
--- a/dalvikvm/Android.bp
+++ b/dalvikvm/Android.bp
@@ -33,7 +33,7 @@ art_cc_binary {
     srcs: ["dalvikvm.cc"],
     shared_libs: [
         "liblog",
-        "libnativehelper",
+        "libnativehelper#impl",
     ],
     header_libs: [
         "art_libartbase_headers", // For base/fast_exit.h
diff --git a/dex2oat/Android.bp b/dex2oat/Android.bp
index 3814a50da8..76620b8429 100644
--- a/dex2oat/Android.bp
+++ b/dex2oat/Android.bp
@@ -261,7 +261,7 @@ art_cc_binary {
             shared_libs: [
                 "libart",
                 "libartbase",
-                "libdexfile",
+                "libdexfile#impl",
                 "libprofile",
             ],
             static_libs: [
@@ -327,7 +327,7 @@ art_cc_binary {
             shared_libs: [
                 "libartbased",
                 "libartd",
-                "libdexfiled",
+                "libdexfiled#impl",
                 "libprofiled",
             ],
             static_libs: [
diff --git a/dexdump/Android.bp b/dexdump/Android.bp
index 9b8989bf09..952bd27ac9 100644
--- a/dexdump/Android.bp
+++ b/dexdump/Android.bp
@@ -43,7 +43,7 @@ art_cc_binary {
     target: {
         android: {
             shared_libs: [
-                "libdexfile",
+                "libdexfile#impl",
                 "libartbase",
                 "libbase",
             ],
diff --git a/dexlist/Android.bp b/dexlist/Android.bp
index 86683520f2..3a232a778b 100644
--- a/dexlist/Android.bp
+++ b/dexlist/Android.bp
@@ -28,7 +28,7 @@ art_cc_binary {
     host_supported: true,
     srcs: ["dexlist.cc"],
     shared_libs: [
-        "libdexfile",
+        "libdexfile#impl",
         "libartbase",
         "libbase",
     ],
diff --git a/oatdump/Android.bp b/oatdump/Android.bp
index 024d06eeaf..066ad1b17b 100644
--- a/oatdump/Android.bp
+++ b/oatdump/Android.bp
@@ -64,7 +64,7 @@ art_cc_binary {
                 "libart-disassembler",
                 "libartbase",
                 "libbase",
-                "libdexfile",
+                "libdexfile#impl",
                 "libprofile",
             ],
             static_libs: [
@@ -118,7 +118,7 @@ art_cc_binary {
                 "libartd",
                 "libartd-disassembler",
                 "libbase",
-                "libdexfiled",
+                "libdexfiled#impl",
                 "libprofiled",
             ],
             static_libs: [
diff --git a/openjdkjvmti/Android.bp b/openjdkjvmti/Android.bp
index a5ca0e14c4..3e9b1798a0 100644
--- a/openjdkjvmti/Android.bp
+++ b/openjdkjvmti/Android.bp
@@ -111,7 +111,7 @@ art_cc_library {
     defaults: ["libopenjdkjvmti_defaults"],
     shared_libs: [
         "libart",
-        "libdexfile",
+        "libdexfile#impl",
         "libartbase",
     ],
     apex_available: [
@@ -129,7 +129,7 @@ art_cc_library {
     ],
     shared_libs: [
         "libartd",
-        "libdexfiled",
+        "libdexfiled#impl",
         "libartbased",
     ],
     apex_available: [
diff --git a/perfetto_hprof/Android.bp b/perfetto_hprof/Android.bp
index bca3bf5925..2ee95bc609 100644
--- a/perfetto_hprof/Android.bp
+++ b/perfetto_hprof/Android.bp
@@ -84,7 +84,7 @@ art_cc_library {
     shared_libs: [
         "libart",
         "libartbase",
-        "libdexfile",
+        "libdexfile#impl",
     ],
     apex_available: [
         "com.android.art",
@@ -102,7 +102,7 @@ art_cc_library {
     shared_libs: [
         "libartd",
         "libartbased",
-        "libdexfiled",
+        "libdexfiled#impl",
     ],
     apex_available: [
         "com.android.art.debug",
diff --git a/profman/Android.bp b/profman/Android.bp
index 623033cd40..b3dcb6d490 100644
--- a/profman/Android.bp
+++ b/profman/Android.bp
@@ -97,7 +97,7 @@ art_cc_binary {
         android: {
             shared_libs: [
                 "libartbase",
-                "libdexfile",
+                "libdexfile#impl",
                 "libprofile",
             ],
         },
@@ -126,7 +126,7 @@ art_cc_binary {
         android: {
             shared_libs: [
                 "libartbased",
-                "libdexfiled",
+                "libdexfiled#impl",
                 "libprofiled",
             ],
         },
diff --git a/tools/dexanalyze/Android.bp b/tools/dexanalyze/Android.bp
index 819c9828f5..4affca100d 100644
--- a/tools/dexanalyze/Android.bp
+++ b/tools/dexanalyze/Android.bp
@@ -42,7 +42,7 @@ art_cc_binary {
     name: "dexanalyze",
     defaults: ["dexanalyze-defaults"],
     shared_libs: [
-        "libdexfile",
+        "libdexfile#impl",
         "libartbase",
         "libbase",
     ],