commit 3c43b3863328e339dff90b216aed15194d129e4a
author Nicolas Geoffray <ngeoffray@google.com> Fri Dec 11 15:01:04 2015 +0000
committer Nicolas Geoffray <ngeoffray@google.com> Fri Dec 11 15:01:04 2015 +0000
tree b0ef66e9b7e86724a007ffbb135d23f38a9ea113
parent 026688070c8002911dc0a8f1fb487bf5bfed52d4

Special case system_server to not create the JIT code cache.

Change-Id: I7d2622f560435b2b6d133b0acd2659f3410acd2e

core/jni/com_android_internal_os_Zygote.cpp

diff --git a/core/jni/com_android_internal_os_Zygote.cpp b/core/jni/com_android_internal_os_Zygote.cpp
index 73c7487..96d150b 100644
--- a/core/jni/com_android_internal_os_Zygote.cpp
+++ b/core/jni/com_android_internal_os_Zygote.cpp
@@ -581,7 +581,7 @@
     UnsetSigChldHandler();
 
     env->CallStaticVoidMethod(gZygoteClass, gCallPostForkChildHooks, debug_flags,
-                              is_system_server ? NULL : instructionSet);
+                              is_system_server, instructionSet);
     if (env->ExceptionCheck()) {
       RuntimeAbort(env, __LINE__, "Error calling post fork hooks.");
     }
@@ -652,7 +652,7 @@
 int register_com_android_internal_os_Zygote(JNIEnv* env) {
   gZygoteClass = MakeGlobalRefOrDie(env, FindClassOrDie(env, kZygoteClassName));
   gCallPostForkChildHooks = GetStaticMethodIDOrDie(env, gZygoteClass, "callPostForkChildHooks",
-                                                   "(ILjava/lang/String;)V");
+                                                   "(IZLjava/lang/String;)V");
 
   return RegisterMethodsOrDie(env, "com/android/internal/os/Zygote", gMethods, NELEM(gMethods));
 }