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

Commit 66304a0a authored by Elliott Hughes's avatar Elliott Hughes
Browse files

Move cutils over to mallopt(). 

Bug: http://b/135772972
Test: treehugger
Change-Id: I35e0fc657f2e4cecea2a29f78cad148895413e17
parent 76d44b07

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 {