Tweak linux_glibc properties for musl builds in external/jemalloc_new

For convenience, builds against musl libc currently use the
linux_glibc properties because they are almost always linux-specific
and not glibc-specific.  In preparation for removing this hack,
tweak the linux_glibc properties by either moving them to host_linux,
which will apply to linux_glibc, linux_musl and linux_bionic, or
by setting appropriate musl or linux_musl properties.  Properties
that must not be repeated while musl uses linux_musl and also still
uses the linux_glibc properties are moved to glibc properties, which
don't apply to musl.  Whether these stay as glibc properties or get
moved back to linux_glibc later once the musl hack is removed is TBD.

Bug: 223257095
Test: m checkbuild
Test: m USE_HOST_MUSL=true host-native
Change-Id: Ia3fd92d2f3494d64a7565d8016ff9aa09574e086

1 files changed, 4 insertions, 3 deletions

diff --git a/Android.bp b/Android.bp
index b52c09ef..1f5855a1 100644
--- a/Android.bp
+++ b/Android.bp
@@ -122,7 +122,6 @@ android_product_variables = {
 
 cc_defaults {
     name: "jemalloc5_defaults",
-    defaults: ["linux_bionic_supported"],
     host_supported: true,
     native_bridge_supported: true,
     cflags: common_cflags,
@@ -132,7 +131,7 @@ cc_defaults {
             cflags: android_common_cflags,
             product_variables: android_product_variables,
         },
-        linux_glibc: {
+        linux_bionic: {
             enabled: true,
         },
     },
@@ -338,8 +337,10 @@ cc_test {
     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,