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

Commit abeba1ff authored by Andreas Gampe's avatar Andreas Gampe Committed by Android Git Automerger
Browse files

am c10fa20b: am 02c4bbb9: Merge "Frameworks/base: Support dex2oat threads system property" 

* commit 'c10fa20b':
  Frameworks/base: Support dex2oat threads system property
parents ad0acc08 c10fa20b

core/jni/AndroidRuntime.cpp

+5 −0
Original line number Diff line number Diff line
@@ -558,6 +558,8 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv) 
    char dex2oatXmxFlagsBuf[sizeof("-Xmx")-1 + PROPERTY_VALUE_MAX];

    char dex2oatCompilerFilterBuf[sizeof("--compiler-filter=")-1 + PROPERTY_VALUE_MAX];

    char dex2oatImageCompilerFilterBuf[sizeof("--compiler-filter=")-1 + PROPERTY_VALUE_MAX];

    char dex2oatThreadsBuf[sizeof("-j")-1 + PROPERTY_VALUE_MAX];

    char dex2oatThreadsImageBuf[sizeof("-j")-1 + PROPERTY_VALUE_MAX];

    char dex2oatFlagsBuf[PROPERTY_VALUE_MAX];

    char dex2oatImageFlagsBuf[PROPERTY_VALUE_MAX];

    char extraOptsBuf[PROPERTY_VALUE_MAX];
@@ -732,6 +734,9 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv) 
        parseCompilerOption("dalvik.vm.dex2oat-filter", dex2oatCompilerFilterBuf,

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

    }

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

    parseCompilerOption("dalvik.vm.image-dex2oat-threads", dex2oatThreadsImageBuf, "-j",

                        "-Ximage-compiler-option");

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

    parseExtraOpts(dex2oatFlagsBuf, "-Xcompiler-option");