commit b0dbd53706069619146ce04c7fc34ab08936334d
author Colin Cross <ccross@android.com> Mon Mar 14 22:23:57 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Mar 14 22:23:57 2022 +0000
tree 197ea5de65685c58a5c50beb6770c7dd850ff332
parent ee7f8914962bcc6fbbb76a692b1a9a5d4f8b5333
parent 9bf8eb3e0e67eeb198b9f4a6d73b59739581d428

Tweak linux_glibc properties for musl builds in external/jemalloc_new am: 6922f4491d am: b3d247b675 am: 9bf8eb3e0e

Original change: https://android-review.googlesource.com/c/platform/external/jemalloc_new/+/2019081

Change-Id: If3f738a33b5798fb515a6bfb3da25a3cf9cfa54a

Android.bp

diff --git a/Android.bp b/Android.bp
index b52c09e..1f5855a 100644
--- a/Android.bp
+++ b/Android.bp
@@ -122,7 +122,6 @@
 
 cc_defaults {
     name: "jemalloc5_defaults",
-    defaults: ["linux_bionic_supported"],
     host_supported: true,
     native_bridge_supported: true,
     cflags: common_cflags,
@@ -132,7 +131,7 @@
             cflags: android_common_cflags,
             product_variables: android_product_variables,
         },
-        linux_glibc: {
+        linux_bionic: {
             enabled: true,
         },
     },
@@ -338,8 +337,10 @@
     test_per_src: true,
 
     target: {
-        linux_glibc: {
+        linux_bionic: {
             enabled: true,
+        },
+        linux_glibc: {
             // The sanitizer does not work for these tests on the host.
             sanitize: {
                 never: true,