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

Commit ea1287b5 authored by Evgenii Stepanov's avatar Evgenii Stepanov Committed by android-build-merger
Browse files

Merge "Skip memory limits under HWASan, same as ASan." am: 4eeaffe5 am: 85998cd8 

am: e0c8a8c8

Change-Id: I2b69c476aa5f612e85d385b5e656ffb76c626d3b
parents f42230f2 e0c8a8c8

media/libmedia/MediaUtils.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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

+2 −1
Original line number Diff line number Diff line
@@ -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;

}



/**