Merge "zygote: remove ashmem initialization" am: 1f38a14659
am: 2f9d682ed4
Change-Id: I43ac75b53527ff232951b3cf0f7c550d1b954c47
This commit is contained in:
@@ -74,7 +74,6 @@
|
|||||||
#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 <bionic/malloc.h>
|
||||||
#include <cutils/ashmem.h>
|
|
||||||
#include <cutils/fs.h>
|
#include <cutils/fs.h>
|
||||||
#include <cutils/multiuser.h>
|
#include <cutils/multiuser.h>
|
||||||
#include <private/android_filesystem_config.h>
|
#include <private/android_filesystem_config.h>
|
||||||
@@ -1590,11 +1589,6 @@ static void com_android_internal_os_Zygote_nativeInitNativeState(JNIEnv* env, jc
|
|||||||
if (!SetTaskProfiles(0, {})) {
|
if (!SetTaskProfiles(0, {})) {
|
||||||
ZygoteFailure(env, "zygote", nullptr, "Zygote SetTaskProfiles failed");
|
ZygoteFailure(env, "zygote", nullptr, "Zygote SetTaskProfiles failed");
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
|
||||||
* ashmem initialization to avoid dlopen overhead
|
|
||||||
*/
|
|
||||||
ashmem_init();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
Reference in New Issue
Block a user