commit 14e01ac5e221c7e27dc0f7bb7e0db8e7aade2f21
author Colin Cross <ccross@android.com> Tue Mar 15 03:47:57 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Mar 15 03:47:57 2022 +0000
tree bb306a8fd9c460d13c04db7ad80d562e8186f1d9
parent 93f3017e03756d47614bc0a68b24258a70d1be0b
parent da446cc5ccc9abdd3610ecb439ed3d969d7b59b4

Merge "Tweak linux_glibc properties for musl builds in bionic"

benchmarks/spawn/Android.bp

diff --git a/benchmarks/spawn/Android.bp b/benchmarks/spawn/Android.bp
index 89d22e3..61e7bf6 100644
--- a/benchmarks/spawn/Android.bp
+++ b/benchmarks/spawn/Android.bp
@@ -43,6 +43,9 @@
         linux_glibc_x86: {
             enabled: false,
         },
+        linux_musl_x86: {
+            enabled: false,
+        },
     },
 }
 
@@ -103,6 +106,11 @@
                 "-Wl,--rpath,${ORIGIN}/../../lib64",
             ],
         },
+        linux_musl_x86_64: {
+            ldflags: [
+                "-Wl,--rpath,${ORIGIN}/../../lib64",
+            ],
+        },
     },
 }
 

linker/Android.bp

diff --git a/linker/Android.bp b/linker/Android.bp
index dbefcf6..d5e7367 100644
--- a/linker/Android.bp
+++ b/linker/Android.bp
@@ -28,16 +28,11 @@
     name: "linker_wrapper",
     host_supported: true,
     device_supported: false,
+    enabled: false,
     target: {
         linux_bionic: {
             enabled: true,
         },
-        linux_glibc: {
-            enabled: false,
-        },
-        darwin: {
-            enabled: false,
-        },
     },
 
     cflags: [