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

Commit 47ac2c2a authored by Eric Biggers's avatar Eric Biggers Committed by Android (Google) Code Review
Browse files

Merge "AndroidRuntime: stop checking for CryptKeeper mode"

parents 5982c27c e7783f63

core/jni/AndroidRuntime.cpp

+39 −54
Original line number Diff line number Diff line
@@ -676,7 +676,6 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv, bool zygote, bool p 
    char dex2oatFlagsBuf[PROPERTY_VALUE_MAX];

    char dex2oatImageFlagsBuf[PROPERTY_VALUE_MAX];

    char extraOptsBuf[PROPERTY_VALUE_MAX];

    char voldDecryptBuf[PROPERTY_VALUE_MAX];

    char perfettoHprofOptBuf[sizeof("-XX:PerfettoHprof=") + PROPERTY_VALUE_MAX];

    char perfettoJavaHeapStackOptBuf[

            sizeof("-XX:PerfettoJavaHeapStackProf=") + PROPERTY_VALUE_MAX];
@@ -958,19 +957,9 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv, bool zygote, bool p 
        addOption("-Xint:jit");

    }



    // If we are booting without the real /data, don't spend time compiling.

    property_get("vold.decrypt", voldDecryptBuf, "");

    bool skip_compilation = ((strcmp(voldDecryptBuf, "trigger_restart_min_framework") == 0) ||

                             (strcmp(voldDecryptBuf, "1") == 0));



    // Extra options for JIT.

    if (skip_compilation) {

        addOption("-Xcompiler-option");

        addOption("--compiler-filter=assume-verified");

    } else {

    parseCompilerOption("dalvik.vm.dex2oat-filter", dex2oatCompilerFilterBuf,

                        "--compiler-filter=", "-Xcompiler-option");

    }

    parseCompilerOption("dalvik.vm.dex2oat-threads", dex2oatThreadsBuf, "-j", "-Xcompiler-option");

    parseCompilerOption("dalvik.vm.dex2oat-cpu-set", dex2oatCpuSetBuf, "--cpu-set=",

                        "-Xcompiler-option");
@@ -1011,9 +1000,6 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv, bool zygote, bool p 
    parseExtraOpts(extraOptsBuf, NULL);



    // Extra options for boot image generation.

    if (skip_compilation) {

        addOption("-Xnoimage-dex2oat");

    } else {

    parseCompilerRuntimeOption("dalvik.vm.image-dex2oat-Xms", dex2oatXmsImageFlagsBuf,

                               "-Xms", "-Ximage-compiler-option");

    parseCompilerRuntimeOption("dalvik.vm.image-dex2oat-Xmx", dex2oatXmxImageFlagsBuf,
@@ -1055,7 +1041,6 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv, bool zygote, bool p 


    property_get("dalvik.vm.image-dex2oat-flags", dex2oatImageFlagsBuf, "");

    parseExtraOpts(dex2oatImageFlagsBuf, "-Ximage-compiler-option");

    }



    /* Set the properties for locale */

    {