Enable scudo for non-svelte configs.
Scudo still isn't quite at the same RSS as jemalloc for the svelte config
so only enable this for normal config.
Bug: 137795072
Test: Built svelte config and verified it is still jemalloc.
Test: Ran performance tests on normal config (bionic benchmarks).
Test: Ran trace tests (system/extras/memory_replay).
Test: Ran scudo unit tests.
Test: Ran bionic unit tests.
Test: Ran libmemunreachable tests.
Test: Ran atest CtsRsBlasTestCases on cuttlefish.
Test: Ran atest AslrMallocTest.
Test: Ran atest CtsHiddenApiKillswitchWildcardTestCases and verified it has
Test: the same runtime as the jemalloc.
Change-Id: I241165feb8fe9ea814b7b166e3aaa6563d18524a
diff --git a/libc/Android.bp b/libc/Android.bp
index 147c2bb..92951f7 100644
--- a/libc/Android.bp
+++ b/libc/Android.bp
@@ -104,10 +104,9 @@
// Defaults for native allocator libs/includes to make it
// easier to change.
-// Enable scudo for non-svelte config by adding the line:
+// To disable scudo for the non-svelte config remove the line:
// product_variables: libc_scudo_product_variables,
-// to the cc_defaults below. And remove the defaults line
-// in the libc_scudo library.
+// in the cc_defaults below.
// ========================================================
cc_defaults {
name: "libc_native_allocator_defaults",
@@ -117,6 +116,7 @@
"libc_jemalloc_wrapper",
],
header_libs: ["gwp_asan_headers"],
+ product_variables: libc_scudo_product_variables,
}
// Functions not implemented by jemalloc directly, or that need to
@@ -2566,7 +2566,6 @@
cc_library_shared {
name: "libc_scudo",
- defaults: ["libc_scudo_wrapper_defaults"],
vendor_available: true,
stl: "none",
system_shared_libs: [],