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

Commit 8df431a8 authored by David Srbecky's avatar David Srbecky Committed by android-build-merger
Browse files

Merge "Propagate the "dalvik.vm.minidebuginfo" property to ART run-time." 

am: ddd440b8

Change-Id: Ic6bb0ab7eeaee99b625f035d0745df00f701c9c5
parents b7afa3f6 ddd440b8

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

+2 −0
Original line number Original line Diff line number Diff line
@@ -57,6 +57,8 @@ public final class Zygote { 
    public static final int ONLY_USE_SYSTEM_OAT_FILES = 1 << 10;

    public static final int ONLY_USE_SYSTEM_OAT_FILES = 1 << 10;

    /** Do not enfore hidden API access restrictions. */

    /** Do not enfore hidden API access restrictions. */

    public static final int DISABLE_HIDDEN_API_CHECKS = 1 << 11;

    public static final int DISABLE_HIDDEN_API_CHECKS = 1 << 11;

    /** Force generation of native debugging information for backtraces. */

    public static final int DEBUG_GENERATE_MINI_DEBUG_INFO = 1 << 12;





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

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

    public static final int MOUNT_EXTERNAL_NONE = 0;

    public static final int MOUNT_EXTERNAL_NONE = 0;

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

+5 −1
Original line number Original line Diff line number Diff line
@@ -3878,9 +3878,13 @@ public class ActivityManagerService extends IActivityManager.Stub 
                runtimeFlags |= Zygote.DEBUG_ENABLE_CHECKJNI;

                runtimeFlags |= Zygote.DEBUG_ENABLE_CHECKJNI;

            }

            }

            String genDebugInfoProperty = SystemProperties.get("debug.generate-debug-info");

            String genDebugInfoProperty = SystemProperties.get("debug.generate-debug-info");

            if ("true".equals(genDebugInfoProperty)) {

            if ("1".equals(genDebugInfoProperty) || "true".equals(genDebugInfoProperty)) {

                runtimeFlags |= Zygote.DEBUG_GENERATE_DEBUG_INFO;

                runtimeFlags |= Zygote.DEBUG_GENERATE_DEBUG_INFO;

            }

            }

            String genMiniDebugInfoProperty = SystemProperties.get("dalvik.vm.minidebuginfo");

            if ("1".equals(genMiniDebugInfoProperty) || "true".equals(genMiniDebugInfoProperty)) {

                runtimeFlags |= Zygote.DEBUG_GENERATE_MINI_DEBUG_INFO;

            }

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

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

                runtimeFlags |= Zygote.DEBUG_ENABLE_JNI_LOGGING;

                runtimeFlags |= Zygote.DEBUG_ENABLE_JNI_LOGGING;

            }

            }