commit 4eeaffe5ee9e806fa56dce69657ea30c11e0fbad
author Treehugger Robot <treehugger-gerrit@google.com> Fri Aug 24 17:29:48 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Aug 24 17:29:48 2018 +0000
tree be42259512ec3ef494985c301cc7f5f075912244
parent db44c5d13b9972a0d0dd177c31259b74bc2e4376
parent 7bd26ab0a794612f633457067288e30ed0efd520

Merge "Skip memory limits under HWASan, same as ASan."

media/libmedia/MediaUtils.cpp

diff --git a/media/libmedia/MediaUtils.cpp b/media/libmedia/MediaUtils.cpp
index bcdc3bd..320c7a9 100644
--- a/media/libmedia/MediaUtils.cpp
+++ b/media/libmedia/MediaUtils.cpp
@@ -34,7 +34,7 @@
     size_t percentageOfTotalMem) {
 
     if (running_with_asan()) {
-        ALOGW("Running with ASan, skip enforcing memory limitations.");
+        ALOGW("Running with (HW)ASan, skip enforcing memory limitations.");
         return;
     }
 

media/libmedia/MediaUtils.h

diff --git a/media/libmedia/MediaUtils.h b/media/libmedia/MediaUtils.h
index a678bcc..26075c4 100644
--- a/media/libmedia/MediaUtils.h
+++ b/media/libmedia/MediaUtils.h
@@ -20,9 +20,10 @@
 namespace android {
 
 extern "C" void __asan_init(void) __attribute__((weak));
+extern "C" void __hwasan_init(void) __attribute__((weak));
 
 static inline int running_with_asan() {
-    return &__asan_init != 0;
+    return &__asan_init != 0 || &__hwasan_init != 0;
 }
 
 /**