Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6184f98d authored by Christopher Ferris's avatar Christopher Ferris Committed by android-build-merger
Browse files

Merge "Add support for scudo native allocator." am: 8338b11a am: 9a3af86f 

am: b37bf7b2

Change-Id: I269d51cb1ce327c27074d34fa4ce05883a3fc33b
parents 72b6302c b37bf7b2

core/jni/android_os_Debug.cpp

+2 −0
Original line number Diff line number Diff line
@@ -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:")) {