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

Commit 9abbf45c authored Nov 05, 2015 by Nicolas Geoffray

Remove DEBUG_JIT from Zygote flags.

The flag is being obsolete by the move to JIT.

Change-Id: Ifb9fab7c561c7f5137aa78c34dd55c552a9505f5

parent a22d77e2

core/java/android/os/Process.java

+0 −3

Original line number	Diff line number	Diff line
		@@ -632,9 +632,6 @@ public class Process {
		if ((debugFlags & Zygote.DEBUG_ENABLE_CHECKJNI) != 0) {
		argsForZygote.add("--enable-checkjni");
		}
		if ((debugFlags & Zygote.DEBUG_ENABLE_JIT) != 0) {
		argsForZygote.add("--enable-jit");
		}
		if ((debugFlags & Zygote.DEBUG_GENERATE_DEBUG_INFO) != 0) {
		argsForZygote.add("--generate-debug-info");
		}

core/java/com/android/internal/os/Zygote.java

+1 −3

Original line number	Diff line number	Diff line
		@@ -39,10 +39,8 @@ public final class Zygote {
		public static final int DEBUG_ENABLE_SAFEMODE = 1 << 3;
		/** Enable logging of third-party JNI activity. */
		public static final int DEBUG_ENABLE_JNI_LOGGING = 1 << 4;
		/** enable the JIT compiler */
		public static final int DEBUG_ENABLE_JIT = 1 << 5;
		/** Force generation of native debugging information. */
		public static final int DEBUG_GENERATE_DEBUG_INFO = 1 << 6;
		public static final int DEBUG_GENERATE_DEBUG_INFO = 1 << 5;

		/** No external storage should be mounted. */
		public static final int MOUNT_EXTERNAL_NONE = 0;

core/java/com/android/internal/os/ZygoteConnection.java

+1 −3

Original line number	Diff line number	Diff line
		@@ -322,7 +322,7 @@ class ZygoteConnection {

		/**
		* From --enable-debugger, --enable-checkjni, --enable-assert,
		* --enable-safemode, --enable-jit, --generate-debug-info and --enable-jni-logging.
		* --enable-safemode, --generate-debug-info and --enable-jni-logging.
		*/
		int debugFlags;

		@@ -432,8 +432,6 @@ class ZygoteConnection {
		debugFlags \|= Zygote.DEBUG_ENABLE_SAFEMODE;
		} else if (arg.equals("--enable-checkjni")) {
		debugFlags \|= Zygote.DEBUG_ENABLE_CHECKJNI;
		} else if (arg.equals("--enable-jit")) {
		debugFlags \|= Zygote.DEBUG_ENABLE_JIT;
		} else if (arg.equals("--generate-debug-info")) {
		debugFlags \|= Zygote.DEBUG_GENERATE_DEBUG_INFO;
		} else if (arg.equals("--enable-jni-logging")) {

services/core/java/com/android/server/am/ActivityManagerService.java

+0 −9

Original line number	Diff line number	Diff line
		@@ -3332,15 +3332,6 @@ public final class ActivityManagerService extends ActivityManagerNative
		if ("1".equals(SystemProperties.get("debug.checkjni"))) {
		debugFlags \|= Zygote.DEBUG_ENABLE_CHECKJNI;
		}
		String jitDebugProperty = SystemProperties.get("debug.usejit");
		if ("true".equals(jitDebugProperty)) {
		debugFlags \|= Zygote.DEBUG_ENABLE_JIT;
		} else if (!"false".equals(jitDebugProperty)) {
		// If we didn't force disable by setting false, defer to the dalvik vm options.
		if ("true".equals(SystemProperties.get("dalvik.vm.usejit"))) {
		debugFlags \|= Zygote.DEBUG_ENABLE_JIT;
		}
		}
		String genDebugInfoProperty = SystemProperties.get("debug.generate-debug-info");
		if ("true".equals(genDebugInfoProperty)) {
		debugFlags \|= Zygote.DEBUG_GENERATE_DEBUG_INFO;