commit 8338b11afa631423d79ebcd92c51e16b6afcf835
author Christopher Ferris <cferris@google.com> Wed Sep 25 22:34:37 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Sep 25 22:34:37 2019 +0000
tree be2733fbe21e78a2fc8ba5a6de6fbcf22c4abcba
parent ce2417fa9cb0ce03e93c08955b9d4e17117b1ded
parent 785a8e906436c13dcc687598e36b625cfc6529dc

Merge "Add support for scudo native allocator."

core/jni/android_os_Debug.cpp

diff --git a/core/jni/android_os_Debug.cpp b/core/jni/android_os_Debug.cpp
index f6385cb..7c6a25b 100644
--- a/core/jni/android_os_Debug.cpp
+++ b/core/jni/android_os_Debug.cpp
@@ -257,6 +257,8 @@
             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:")) {