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

Commit 8fa7e930 authored by Calin Juravle's avatar Calin Juravle Committed by Gerrit Code Review
Browse files

Merge "Parse method-trace properties only in debug builds."

parents 37bf3ec9 92290b89

core/jni/AndroidRuntime.cpp

+15 −14
Original line number Diff line number Diff line
@@ -889,9 +889,9 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv, bool zygote) 
                       profileMaxStackDepth,

                       "-Xprofile-max-stack-depth:");



    /*

     * Tracing options.

     */

    // Trace files are stored in /data/misc/trace which is writable only in debug mode.

    property_get("ro.debuggable", propBuf, "0");

    if (strcmp(propBuf, "1") == 0) {

        property_get("dalvik.vm.method-trace", propBuf, "false");

        if (strcmp(propBuf, "true") == 0) {

            addOption("-Xmethod-trace");
@@ -906,6 +906,7 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv, bool zygote) 
                addOption("-Xmethod-trace-stream");

            }

        }

    }



    // Native bridge library. "0" means that native bridge is disabled.

    property_get("ro.dalvik.vm.native.bridge", propBuf, "");