Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 67aae037 authored by Tim Murray's avatar Tim Murray Committed by android-build-merger
Browse files

Merge "Merge "zygote: initialize ashmem early" am: 6c155a2c am: 38326bd8" into qt-dev-plus-aosp

am: 7039de7e

Change-Id: I24e4f67d3f7c02e606143a3db260ad5aa4c1cdb8
parents a9f98805 7039de7e
Loading
Loading
Loading
Loading
+6 −0
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@
#include <android-base/stringprintf.h>
#include <android-base/strings.h>
#include <android-base/unique_fd.h>
#include <cutils/ashmem.h>
#include <cutils/fs.h>
#include <cutils/multiuser.h>
#include <private/android_filesystem_config.h>
@@ -1925,6 +1926,11 @@ 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();
}

/**