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

Commit 6e6df01f authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Move cutils over to mallopt()."

parents ecd550a8 66304a0a

libcutils/Android.bp

+0 −3
Original line number Diff line number Diff line
@@ -210,9 +210,6 @@ cc_library { 
                "uevent.cpp",

            ],

        },

        bionic: {

            header_libs: ["bionic_libc_platform_headers"],

        },



        android_arm: {

            sanitize: {

libcutils/memory.cpp

+4 −7
Original line number Diff line number Diff line
@@ -18,19 +18,16 @@ 


#include <log/log.h>



#ifdef __BIONIC__

#include <bionic/malloc.h>

#endif

#include <malloc.h>



void process_disable_memory_mitigations() {

    bool success = false;

#ifdef __BIONIC__

    // TODO(b/158870657) is fixed and scudo is used globally, we can assert when an

    // an error is returned.



    success = android_mallopt(M_DISABLE_MEMORY_MITIGATIONS, nullptr, 0);

    success = mallopt(M_BIONIC_DISABLE_MEMORY_MITIGATIONS, 0);

#endif



    // TODO: if b/158870657 is fixed and scudo is used globally,

    // we can assert on failure rather than just log.

    if (success) {

        ALOGI("Disabled memory mitigations for process.");

    } else {