Merge "Tweak linux_glibc properties for musl builds in bionic"

2022-03-15 03:47:57 +00:00 · 2022-03-15 03:47:57 +00:00 · 14e01ac5e2
commit 14e01ac5e2
parent 93f3017e03 da446cc5cc
2 changed files with 9 additions and 6 deletions
--- a/benchmarks/spawn/Android.bp
+++ b/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",
+            ],
+        },
    },
 }

--- a/linker/Android.bp
+++ b/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: [