diff options
| author | Nicolas Geoffray <ngeoffray@google.com> | 2015-11-05 11:29:42 +0000 |
|---|---|---|
| committer | Nicolas Geoffray <ngeoffray@google.com> | 2015-11-18 10:07:53 +0000 |
| commit | 245ec92b653ce51278498f10fddbb0f089404f1d (patch) | |
| tree | f036a0206f1c6c31b243c79eab5a7ba4528e0a22 /core/java | |
| parent | 9574e58027f8edeb539ecedf2988c1a302887807 (diff) | |
Remove DEBUG_JIT from Zygote flags.
The flag is being obsolete by the move to JIT.
(cherry picked from commit 9abbf45c8dcdb2e5b13b615e5138ad996fe8afa3)
Change-Id: I3ce4577e81f91e9dd55d44116e0f9e2014bd00b8
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/os/Process.java | 3 | ||||
| -rw-r--r-- | core/java/com/android/internal/os/Zygote.java | 4 | ||||
| -rw-r--r-- | core/java/com/android/internal/os/ZygoteConnection.java | 4 |
3 files changed, 2 insertions, 9 deletions
diff --git a/core/java/android/os/Process.java b/core/java/android/os/Process.java index 7234e985757a..366ba0b60858 100644 --- a/core/java/android/os/Process.java +++ b/core/java/android/os/Process.java @@ -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"); } diff --git a/core/java/com/android/internal/os/Zygote.java b/core/java/com/android/internal/os/Zygote.java index 197004c93dcb..8186378bfb6f 100644 --- a/core/java/com/android/internal/os/Zygote.java +++ b/core/java/com/android/internal/os/Zygote.java @@ -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; diff --git a/core/java/com/android/internal/os/ZygoteConnection.java b/core/java/com/android/internal/os/ZygoteConnection.java index 3e86fac74f2d..a40f9a82ace7 100644 --- a/core/java/com/android/internal/os/ZygoteConnection.java +++ b/core/java/com/android/internal/os/ZygoteConnection.java @@ -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")) { |