Merge "Add support for scudo native allocator." am: 8338b11afa

am: 9a3af86f6d Change-Id: I5c97711f9f4901e6cefd171121cb4662a7951eff
2019-09-25 16:00:36 -07:00
parent 999db9b2fd 9a3af86f6d
commit b37bf7b20f
1 changed files with 2 additions and 0 deletions
--- 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:")) {