commit b61b70f607182c12252bb6f1ed5ef519cf41b7f1
author Colin Cross <ccross@android.com> Mon Mar 14 21:22:27 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Mar 14 21:22:27 2022 +0000
tree 1a87a55538424e41f72dd7062e7aad197b7b3f79
parent 332e91c18ee4e1c942b37db72fbaa5b357be4f3e
parent 2671c94b96cbb0b79b5aaced816e381b175c14cc

Tweak linux_glibc properties for musl builds in external/scudo am: 2671c94b96

Original change: https://android-review.googlesource.com/c/platform/external/scudo/+/2018982

Change-Id: Id25f389de7aa9c6208bf0ca2702efe5b5865fc63

Android.bp

diff --git a/Android.bp b/Android.bp
index 3eaeef5..ab3fb0d 100644
--- a/Android.bp
+++ b/Android.bp
@@ -149,9 +149,6 @@
                 "bionic_libc_platform_headers",
             ],
         },
-        linux_glibc: {
-            enabled: true,
-        },
         native_bridge: {
             cflags: ["-DSCUDO_DISABLE_TBI"],
         },
@@ -214,10 +211,7 @@
         "-fno-emulated-tls",
     ],
     target: {
-        android: {
-            header_libs: ["bionic_libc_platform_headers"],
-        },
-        linux_bionic: {
+        bionic: {
             header_libs: ["bionic_libc_platform_headers"],
         },
     },