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

Commit 51c66ea4 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:... 

Merge "Propagate the "dalvik.vm.minidebuginfo" property to ART run-time." am: ddd440b8 am: 8df431a8
am: 2eaaf252

Change-Id: Iffc4920eacc01df241ab770bb2805f2b6fc79dce
parents 25a50edc 2eaaf252

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

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

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

    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. */

    public static final int MOUNT_EXTERNAL_NONE = IVold.REMOUNT_MODE_NONE;

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

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

            }

            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;

            }

            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"))) {

                runtimeFlags |= Zygote.DEBUG_ENABLE_JNI_LOGGING;

            }