1 files changed, 11 insertions, 3 deletions
diff --git a/Android.bp b/Android.bp
index 24a73a33..6a295326 100644
--- a/Android.bp
+++ b/Android.bp
@@ -123,7 +123,6 @@ android_product_variables = {
 
 cc_defaults {
     name: "jemalloc5_defaults",
-    defaults: ["linux_bionic_supported"],
     host_supported: true,
     native_bridge_supported: true,
     cflags: common_cflags,
@@ -133,7 +132,7 @@ cc_defaults {
             cflags: android_common_cflags,
             product_variables: android_product_variables,
         },
-        linux_glibc: {
+        linux_bionic: {
             enabled: true,
         },
     },
@@ -205,6 +204,11 @@ cc_library {
             system_shared_libs: [],
             header_libs: ["libc_headers"],
         },
+        musl: {
+            // Linking against musl uses libjemalloc5 by default, list only
+            // libc_musl here to avoid a circular dependency.
+            system_shared_libs: ["libc_musl"],
+        },
     },
 }
 
@@ -345,8 +349,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,
@@ -366,6 +372,7 @@ cc_library_static {
     cflags: [
         "-U_FORTIFY_SOURCE",
         "-DJEMALLOC_INTEGRATION_TEST",
+        "-DJEMALLOC_NO_RENAME",
     ],
 
     local_include_dirs: [
@@ -405,6 +412,7 @@ cc_test {
 
     cflags: common_cflags + [
         "-DJEMALLOC_INTEGRATION_TEST",
+        "-DJEMALLOC_NO_RENAME",
     ],
 
     local_include_dirs: common_c_local_includes + [