Snap for 11247270 from dfe9c4d7b203cf8e8981485e00eca05b103628a8 to android14-tests-release

Change-Id: I3fcc055a0dc57f8b9206147e19700b1f479f1795

3 files changed, 8 insertions, 6 deletions

diff --git a/libartpalette/Android.bp b/libartpalette/Android.bp
index 3995d40e1e..2faa926551 100644
--- a/libartpalette/Android.bp
+++ b/libartpalette/Android.bp
@@ -114,9 +114,6 @@ art_cc_library {
 art_cc_defaults {
     name: "art_libartpalette_tests_defaults",
     srcs: ["apex/palette_test.cc"],
-    shared_libs: [
-        "libartpalette",
-    ],
     target: {
         android: {
             static_libs: ["libmodules-utils-build"],
@@ -133,6 +130,7 @@ art_cc_test {
         "art_libartpalette_tests_defaults",
     ],
     shared_libs: [
+        "libartpalette",
         "libnativehelper",
     ],
     host_supported: true,
@@ -147,6 +145,7 @@ art_cc_test {
         "art_libartpalette_tests_defaults",
     ],
     static_libs: [
+        "libartpalette",
         "libc++fs",
         // libnativehelper_lazy has the glue we need to dlsym the platform-only
         // APIs we need, like JniInvocationInit.
diff --git a/libdexfile/Android.bp b/libdexfile/Android.bp
index f0e010664c..73f93a6782 100644
--- a/libdexfile/Android.bp
+++ b/libdexfile/Android.bp
@@ -385,7 +385,6 @@ art_cc_defaults {
         "external/dex_file_ext_test.cc",
     ],
     shared_libs: [
-        "libartbase",
         "libdexfile",
     ],
     header_libs: [
@@ -402,6 +401,9 @@ art_cc_test {
         "art_test_defaults",
         "art_libdexfile_external_tests_defaults",
     ],
+    shared_libs: [
+        "libartbase",
+    ],
 }
 
 // Standalone version of ART gtest `art_libdexfile_external_tests`, not bundled with the ART APEX on
@@ -412,6 +414,9 @@ art_cc_test {
         "art_standalone_test_defaults",
         "art_libdexfile_external_tests_defaults",
     ],
+    static_libs: [
+        "libartbase",
+    ],
 
     test_config_template: ":art-gtests-target-standalone-cts-template",
     test_suites: ["cts"], // For backed-by API coverage.
diff --git a/test/art-gtests-target-standalone-cts-template.xml b/test/art-gtests-target-standalone-cts-template.xml
index 3749c3e990..e862f171e2 100644
--- a/test/art-gtests-target-standalone-cts-template.xml
+++ b/test/art-gtests-target-standalone-cts-template.xml
@@ -30,8 +30,6 @@
     <test class="com.android.tradefed.testtype.GTest" >
         <option name="native-test-device-path" value="/data/local/tmp/{MODULE}" />
         <option name="module-name" value="{MODULE}" />
-        <option name="ld-library-path-32" value="/apex/com.android.art/lib" />
-        <option name="ld-library-path-64" value="/apex/com.android.art/lib64" />
     </test>
 
     <!-- When this test is run in a Mainline context (e.g. with `mts-tradefed`), only enable it if