Merge "Skip memory limits under HWASan, same as ASan." am: 4eeaffe5ee

am: 85998cd83a

Change-Id: Ic94e69066e9c34ab4e0ffeb0f8948cce9283af86

media/libmedia/MediaUtils.cpp

@@ -34,7 +34,7 @@ void limitProcessMemory(
     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

@@ -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;
 }
 
 /**