commit 9981a1dac84169c116241a923d99b365dfe1f462
author Anna Trostanetski <atrost@google.com> Mon Jan 20 20:16:29 2020 +0000
committer Anna Trostanetski <atrost@google.com> Mon Jan 20 20:17:10 2020 +0000
tree ac35a77076a4f86234dd3db4b3f72bb019220495
parent b1989584125ff863986068e2080e0ea686bf0b81

Revert "Enable the scudo native allocator."

This reverts commit b1989584125ff863986068e2080e0ea686bf0b81.

Reason for revert: b/147838132. Breaks JNI calls.

Bug: 147838132

Change-Id: I657cf9fddc1e8ee60c1830a1b3f560ab51928a40

libc/Android.bp

diff --git a/libc/Android.bp b/libc/Android.bp
index 24cb90c..243371b 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 {
@@ -2614,6 +2614,7 @@
 
 cc_library_shared {
     name: "libc_scudo",
+    defaults: ["libc_scudo_wrapper_defaults"],
     vendor_available: true,
     stl: "none",
     system_shared_libs: [],