Snap for 8414339 from b0dbd53706069619146ce04c7fc34ab08936334d to tm-qpr1-releaseandroid-13.0.0_r30android-13.0.0_r29android-13.0.0_r28android-13.0.0_r27android-13.0.0_r24android-13.0.0_r23android-13.0.0_r22android-13.0.0_r21android-13.0.0_r20android-13.0.0_r19android-13.0.0_r18android-13.0.0_r17android-13.0.0_r16android13-qpr1-s8-releaseandroid13-qpr1-s7-releaseandroid13-qpr1-s6-releaseandroid13-qpr1-s5-releaseandroid13-qpr1-s4-releaseandroid13-qpr1-s3-releaseandroid13-qpr1-s2-releaseandroid13-qpr1-s1-releaseandroid13-qpr1-release

Change-Id: Ic5ce2b3d01ade61cb74fb9166b3863090b0abda9

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,