Merge "Remove gMallocLeakZygoteChild."
This commit is contained in:
@@ -72,6 +72,7 @@
|
|||||||
#include <android-base/stringprintf.h>
|
#include <android-base/stringprintf.h>
|
||||||
#include <android-base/strings.h>
|
#include <android-base/strings.h>
|
||||||
#include <android-base/unique_fd.h>
|
#include <android-base/unique_fd.h>
|
||||||
|
#include <bionic_malloc.h>
|
||||||
#include <cutils/ashmem.h>
|
#include <cutils/ashmem.h>
|
||||||
#include <cutils/fs.h>
|
#include <cutils/fs.h>
|
||||||
#include <cutils/multiuser.h>
|
#include <cutils/multiuser.h>
|
||||||
@@ -476,12 +477,9 @@ static void EnableDebugger() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// The debug malloc library needs to know whether it's the zygote or a child.
|
|
||||||
extern "C" int gMallocLeakZygoteChild;
|
|
||||||
|
|
||||||
static void PreApplicationInit() {
|
static void PreApplicationInit() {
|
||||||
// The child process sets this to indicate it's not the zygote.
|
// The child process sets this to indicate it's not the zygote.
|
||||||
gMallocLeakZygoteChild = 1;
|
android_mallopt(M_SET_ZYGOTE_CHILD, nullptr, 0);
|
||||||
|
|
||||||
// Set the jemalloc decay time to 1.
|
// Set the jemalloc decay time to 1.
|
||||||
mallopt(M_DECAY_TIME, 1);
|
mallopt(M_DECAY_TIME, 1);
|
||||||
|
|||||||
Reference in New Issue
Block a user