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

Commit 921b846b authored by Andreas Gampe's avatar Andreas Gampe Committed by android-build-merger
Browse files

Merge "Framework: Remove ART tombstoned config" am: 95c5e5c1 

am: 3c942f04

Change-Id: I8f5d13a2e9916e82b0e756c1c5002558898d6b99
parents 2629cb09 3c942f04

core/jni/AndroidRuntime.cpp

+0 −2
Original line number Original line Diff line number Diff line
@@ -679,8 +679,6 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv, bool zygote) 
        executionMode = kEMJitCompiler;

        executionMode = kEMJitCompiler;

    }

    }





    addOption("-Xusetombstonedtraces");



    strcpy(jniOptsBuf, "-Xjniopts:");

    strcpy(jniOptsBuf, "-Xjniopts:");

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

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

        ALOGI("JNI options: '%s'\n", jniOptsBuf);

        ALOGI("JNI options: '%s'\n", jniOptsBuf);