summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Tri Vo <trong@google.com> 2019-09-26 12:08:10 -0700
committer android-build-merger <android-build-merger@google.com> 2019-09-26 12:08:10 -0700
commite02f88bc2b21ab48c705f6863081ac046e9bdb4c (patch)
treec9103f04b8f544c8b8e9d308b8915aeea8411680
parent4252183449824d77f5c4035e8c12bf504619a5b1 (diff)
parentca642f87fb305fae19595ecde86e23d768bf3b39 (diff)
Merge "zygote: remove ashmem initialization" am: 1f38a14659 am: 2f9d682ed4 am: f6736c1273
am: ca642f87fb Change-Id: I6503682caa7f1c903704252907de9bfb65466fea
-rw-r--r--core/jni/com_android_internal_os_Zygote.cpp6
1 files changed, 0 insertions, 6 deletions
diff --git a/core/jni/com_android_internal_os_Zygote.cpp b/core/jni/com_android_internal_os_Zygote.cpp
index 93ef75148df7..3516dce5d5ed 100644
--- a/core/jni/com_android_internal_os_Zygote.cpp
+++ b/core/jni/com_android_internal_os_Zygote.cpp
@@ -74,7 +74,6 @@
#include <android-base/strings.h>
#include <android-base/unique_fd.h>
#include <bionic/malloc.h>
-#include <cutils/ashmem.h>
#include <cutils/fs.h>
#include <cutils/multiuser.h>
#include <cutils/sockets.h>
@@ -1657,11 +1656,6 @@ static void com_android_internal_os_Zygote_nativeInitNativeState(JNIEnv* env, jc
if (!SetTaskProfiles(0, {})) {
ZygoteFailure(env, "zygote", nullptr, "Zygote SetTaskProfiles failed");
}
-
- /*
- * ashmem initialization to avoid dlopen overhead
- */
- ashmem_init();
}
/**