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

Commit 35f425a4 authored by Narayan Kamath's avatar Narayan Kamath Committed by android-build-merger
Browse files

Merge "AndroidRuntime: pipe down dalvik.vm.stack-trace-dir" am: 0b711e2c am: aab168b7 

am: 0ddced5c

Change-Id: I223e6167bcb5228a5175ebf7308b40a8f974e3d8
parents 15b267d5 0ddced5c

core/jni/AndroidRuntime.cpp

+7 −1
Original line number Diff line number Diff line
@@ -601,6 +601,7 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv, bool zygote) 
{

    JavaVMInitArgs initArgs;

    char propBuf[PROPERTY_VALUE_MAX];

    char stackTraceDirBuf[sizeof("-Xstacktracedir:")-1 + PROPERTY_VALUE_MAX];

    char stackTraceFileBuf[sizeof("-Xstacktracefile:")-1 + PROPERTY_VALUE_MAX];

    char jniOptsBuf[sizeof("-Xjniopts:")-1 + PROPERTY_VALUE_MAX];

    char heapstartsizeOptsBuf[sizeof("-Xms")-1 + PROPERTY_VALUE_MAX];
@@ -678,7 +679,12 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv, bool zygote) 
        executionMode = kEMJitCompiler;

    }



    // If dalvik.vm.stack-trace-dir is set, it enables the "new" stack trace

    // dump scheme and a new file is created for each stack dump. If it isn't set,

    // the old scheme is enabled.

    if (!parseRuntimeOption("dalvik.vm.stack-trace-dir", stackTraceDirBuf, "-Xstacktracedir:")) {

        parseRuntimeOption("dalvik.vm.stack-trace-file", stackTraceFileBuf, "-Xstacktracefile:");

    }



    strcpy(jniOptsBuf, "-Xjniopts:");

    if (parseRuntimeOption("dalvik.vm.jniopts", jniOptsBuf, "-Xjniopts:")) {