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

am: ca642f87fb Change-Id: I6503682caa7f1c903704252907de9bfb65466fea
2019-09-26 12:08:10 -07:00
parent 4252183449 ca642f87fb
commit e02f88bc2b
1 changed files with 0 additions and 6 deletions
--- 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();
 }

 /**