summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Christopher Ferris <cferris@google.com> 2019-09-18 10:42:23 -0700
committer Christopher Ferris <cferris@google.com> 2019-09-25 13:47:29 -0700
commit785a8e906436c13dcc687598e36b625cfc6529dc (patch)
tree1281f6cf8720852e5125f53d347302ff344abe06
parentef530d9fa4820e15f91b8ccc141d5f9a0272a577 (diff)
Add support for scudo native allocator.
Bug: 137795072 Test: dumpsys meminfo <PID> and verified non-zero return for Native Heap Test: using jemalloc and using scudo. Change-Id: I418c89eaf2eb21d64f008435fa588d22523ffdbd
-rw-r--r--core/jni/android_os_Debug.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/core/jni/android_os_Debug.cpp b/core/jni/android_os_Debug.cpp
index f6385cbbcef7..7c6a25beaa90 100644
--- a/core/jni/android_os_Debug.cpp
+++ b/core/jni/android_os_Debug.cpp
@@ -257,6 +257,8 @@ static void load_maps(int pid, stats_t* stats, bool* foundSwapPss)
which_heap = HEAP_NATIVE;
} else if (base::StartsWith(name, "[anon:libc_malloc]")) {
which_heap = HEAP_NATIVE;
+ } else if (base::StartsWith(name, "[anon:scudo:")) {
+ which_heap = HEAP_NATIVE;
} else if (base::StartsWith(name, "[stack")) {
which_heap = HEAP_STACK;
} else if (base::StartsWith(name, "[anon:stack_and_tls:")) {