diff options
| author | 2019-09-25 15:45:03 -0700 | |
|---|---|---|
| committer | 2019-09-25 15:45:03 -0700 | |
| commit | 9a3af86f6d1e96d53bd1b00bc88cf22b83db9b50 (patch) | |
| tree | dba0edafbd30dd8106fa80c22880e6bb513f9f91 | |
| parent | 3371f4323e0a953d13cb48b008206011b5648873 (diff) | |
| parent | 8338b11afa631423d79ebcd92c51e16b6afcf835 (diff) | |
Merge "Add support for scudo native allocator."
am: 8338b11afa
Change-Id: Ic7d49e5d3789c3a061f50c12481572f27fa59b5e
| -rw-r--r-- | core/jni/android_os_Debug.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/core/jni/android_os_Debug.cpp b/core/jni/android_os_Debug.cpp index b9270854b0bc..5539e9f1d70a 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:")) { |