commit 9346552f89bf301bd17da9b66f8990cee7becd40
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Feb 12 03:37:15 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Feb 12 03:37:15 2020 +0000
tree e00cc9cad81e553bcc24b19dd67cd3782f7707b7
parent 8795408c5189e089f1673cc5485916ecf5f38a1b
parent b666519a506bd4befa881b2f83b7d9d27d068c36

Merge "[GWP-ASan] Scan GWP-ASan regions for native allocations." am: b666519a50

Change-Id: I997680166d778e7385430c4806355a13f22dd3b5

core/jni/android_os_Debug.cpp

diff --git a/core/jni/android_os_Debug.cpp b/core/jni/android_os_Debug.cpp
index 7bf35f9..8f9f8d2 100644
--- a/core/jni/android_os_Debug.cpp
+++ b/core/jni/android_os_Debug.cpp
@@ -263,6 +263,8 @@
             which_heap = HEAP_NATIVE;
         } else if (base::StartsWith(name, "[anon:scudo:")) {
             which_heap = HEAP_NATIVE;
+        } else if (base::StartsWith(name, "[anon:GWP-ASan")) {
+            which_heap = HEAP_NATIVE;
         } else if (base::StartsWith(name, "[stack")) {
             which_heap = HEAP_STACK;
         } else if (base::StartsWith(name, "[anon:stack_and_tls:")) {