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

Commit 437ac8f8 authored by Mathieu Chartier's avatar Mathieu Chartier Committed by Gerrit Code Review
Browse files

Merge "Add JIT late override property"

parents 13dbc3d4 7a49028a

core/java/android/os/Process.java

+3 −0
Original line number Diff line number Diff line
@@ -631,6 +631,9 @@ 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_ENABLE_ASSERT) != 0) {

                argsForZygote.add("--enable-assert");

            }

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

+4 −1
Original line number Diff line number Diff line
@@ -34,10 +34,13 @@ public final class Zygote { 
    public static final int DEBUG_ENABLE_CHECKJNI   = 1 << 1;

    /** enable Java programming language "assert" statements */

    public static final int DEBUG_ENABLE_ASSERT     = 1 << 2;

    /** disable the JIT compiler */

    /** disable the AOT compiler and JIT */

    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;





    /** No external storage should be mounted. */

    public static final int MOUNT_EXTERNAL_NONE = 0;

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

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


        /**

         * From --enable-debugger, --enable-checkjni, --enable-assert,

         * --enable-safemode, and --enable-jni-logging.

         * --enable-safemode, --enable-jit, and --enable-jni-logging.

         */

        int debugFlags;
@@ -432,6 +432,8 @@ 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("--enable-jni-logging")) {

                    debugFlags |= Zygote.DEBUG_ENABLE_JNI_LOGGING;

                } else if (arg.equals("--enable-assert")) {

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

+9 −0
Original line number Diff line number Diff line
@@ -2991,6 +2991,15 @@ 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;

                }

            }

            if ("1".equals(SystemProperties.get("debug.jni.logging"))) {

                debugFlags |= Zygote.DEBUG_ENABLE_JNI_LOGGING;

            }