aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2022-03-14 21:22:54 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-03-14 21:22:54 +0000
commitb3d247b6759593bc466205bd796ebee8799e06f5 (patch)
tree197ea5de65685c58a5c50beb6770c7dd850ff332
parent6328b3cf8427c3568577905057399110d8f581d9 (diff)
parent6922f4491d3650a4765520dadfeb3294c6dc076d (diff)
downloadjemalloc_new-b3d247b6759593bc466205bd796ebee8799e06f5.tar.gz
Tweak linux_glibc properties for musl builds in external/jemalloc_new am: 6922f4491d
Original change: https://android-review.googlesource.com/c/platform/external/jemalloc_new/+/2019081 Change-Id: I3462fdb6ba8da270a2d387f54135f791abf6f3c3
-rw-r--r--Android.bp7
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,