Merge "zygote: remove ashmem initialization" am: 1f38a14659 am: 2f9d682ed4

am: f6736c1273

Change-Id: Iff43984edad286b0026a90e5a8c96198232bb0d9
This commit is contained in:
Tri Vo
2019-09-26 12:01:18 -07:00
committed by android-build-merger

View File

@@ -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();
} }
/** /**