commit 5105ece8160b2e2ebf4a663ce6b4d3aa689067cb
author Ytai Ben-tsvi <ytai@google.com> Thu Dec 19 19:08:58 2019 +0000
committer Ytai Ben-tsvi <ytai@google.com> Thu Dec 19 19:09:59 2019 +0000
tree f43417731c81aa512f878960394861bffac8d820
parent 6ffbe97859fb6f753a9c0d1b2bfe220af9b2ca46

Revert "Enable the scudo native allocator."

This reverts commit 6ffbe97859fb6f753a9c0d1b2bfe220af9b2ca46.

Reason for revert: Droidcop-triggered revert due to breakage b/146543543

Change-Id: Ie9a5b2f6ca5dbc8d3c6cafe70e34838d74e45c56
Bug: 146543543

libc/Android.bp

diff --git a/libc/Android.bp b/libc/Android.bp
index 03cdf3d..d418012 100644
--- a/libc/Android.bp
+++ b/libc/Android.bp
@@ -94,7 +94,7 @@
 cc_defaults {
     name: "libc_native_allocator_defaults",
 
-    defaults: ["libc_scudo_defaults"],
+    defaults: ["libc_jemalloc5_defaults"],
 }
 
 cc_defaults {
@@ -2607,6 +2607,7 @@
 
 cc_library_shared {
     name: "libc_scudo",
+    defaults: ["libc_scudo_wrapper_defaults"],
     vendor_available: true,
     stl: "none",
     system_shared_libs: [],