commit dde64731b6d174324c8d7d83a11c320bf2cfa654
author android-build-team Robot <android-build-team-robot@google.com> Thu Feb 13 04:19:53 2020 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Thu Feb 13 04:19:53 2020 +0000
tree 6393713c939698f7e438e344d0ee5f5b9a051b6c
parent 80bb7733fedc19252bad271aa2bd10c36a14707c
parent 9d5db864dd21438bf7c3f8fd158ec990ce87d20d

Snap for 6203617 from 9d5db864dd21438bf7c3f8fd158ec990ce87d20d to rvc-release

Change-Id: I7ad3c6adb6f961aaac3d41d7bdc5156ee1709bbc

Android.bp

diff --git a/Android.bp b/Android.bp
index 62d8cc5..ea81993 100644
--- a/Android.bp
+++ b/Android.bp
@@ -117,5 +117,8 @@
         "libhidlbase",
         "libutils",
     ],
-    test_suites: ["device-tests"],
+    test_suites: [
+        "device-tests",
+        "vts-core"
+    ],
 }

MemUnreachable.cpp

diff --git a/MemUnreachable.cpp b/MemUnreachable.cpp
index c4add19..b02a77e 100644
--- a/MemUnreachable.cpp
+++ b/MemUnreachable.cpp
@@ -252,7 +252,8 @@
       // .rodata or .data section
       globals_mappings.emplace_back(*it);
     } else if (mapping_name == "[anon:libc_malloc]" ||
-               android::base::StartsWith(mapping_name, "[anon:scudo:")) {
+               android::base::StartsWith(mapping_name, "[anon:scudo:") ||
+               android::base::StartsWith(mapping_name, "[anon:GWP-ASan")) {
       // named malloc mapping
       heap_mappings.emplace_back(*it);
     } else if (has_prefix(mapping_name, "[anon:dalvik-")) {