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

Commit 044bf6dd authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "[GWP-ASan] Scan GWP-ASan regions for native allocations." am: b666519a am: 9346552f 

Change-Id: Id9cc755abedce482599d3803608f5f1694bfe3bd
parents 3948f043 9346552f

core/jni/android_os_Debug.cpp

+2 −0
Original line number Diff line number Diff line
@@ -263,6 +263,8 @@ static void load_maps(int pid, stats_t* stats, bool* foundSwapPss) 
            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:")) {