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

Commit 4eeaffe5 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

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

parents db44c5d1 7bd26ab0

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;

}



/**