Merge "Tweak linux_glibc properties for musl builds in bionic" am: 14e01ac5e2 am: 6b6d8f1ee6

Original change: https://android-review.googlesource.com/c/platform/bionic/+/2019615

Change-Id: I40191447bc3ca05e7781ad69a7f5130e0b891f9b

benchmarks/spawn/Android.bp

@@ -43,6 +43,9 @@ cc_defaults {
         linux_glibc_x86: {
             enabled: false,
         },
+        linux_musl_x86: {
+            enabled: false,
+        },
     },
 }
 
@@ -103,6 +106,11 @@ cc_defaults {
                 "-Wl,--rpath,${ORIGIN}/../../lib64",
             ],
         },
+        linux_musl_x86_64: {
+            ldflags: [
+                "-Wl,--rpath,${ORIGIN}/../../lib64",
+            ],
+        },
     },
 }
 

linker/Android.bp

@@ -28,16 +28,11 @@ cc_object {
     name: "linker_wrapper",
     host_supported: true,
     device_supported: false,
+    enabled: false,
     target: {
         linux_bionic: {
             enabled: true,
         },
-        linux_glibc: {
-            enabled: false,
-        },
-        darwin: {
-            enabled: false,
-        },
     },
 
     cflags: [