1 files changed, 2 insertions, 14 deletions
diff --git a/libnativeloader/Android.bp b/libnativeloader/Android.bp
index 0e6389267a..96f56775f6 100644
--- a/libnativeloader/Android.bp
+++ b/libnativeloader/Android.bp
@@ -27,6 +27,7 @@ art_cc_library {
     apex_available: [
         "com.android.art",
         "com.android.art.debug",
+        "test_broken_com.android.art",
     ],
     host_supported: true,
     srcs: [
@@ -64,7 +65,7 @@ art_cc_library {
                 "libdl_android",
             ],
             static_libs: [
-                "PlatformProperties",
+                "libPlatformProperties",
             ],
         },
     },
@@ -176,19 +177,6 @@ art_cc_test {
         },
     },
 
-    // Support multilib variants (using different suffix per sub-architecture), which is needed on
-    // build targets with secondary architectures, as the CTS test suite packaging logic flattens
-    // all test artifacts into a single `testcases` directory.
-    compile_multilib: "both",
-    multilib: {
-        lib32: {
-            suffix: "32",
-        },
-        lib64: {
-            suffix: "64",
-        },
-    },
-
     // Added to CTS for API coverage of libnativeloader which is backed by the
     // ART module.
     test_config_template: ":art-gtests-target-standalone-cts-template",