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

Commit 1c287a03 authored by Orion Hodson's avatar Orion Hodson Committed by android-build-merger
Browse files

Merge "Frameworks/base: Support dex2oat cpu-set system property" am: ba206b8f am: a89b2341 

am: b69904cb

Change-Id: I52e8c3ad399d20e78d85abb57f7f2192f2d414e8
parents 875cd029 b69904cb

core/jni/AndroidRuntime.cpp

+6 −0
Original line number Diff line number Diff line
@@ -622,6 +622,8 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv, bool zygote, bool p 
    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 dex2oatCpuSetBuf[sizeof("--cpu-set=")-1 + PROPERTY_VALUE_MAX];

    char dex2oatCpuSetImageBuf[sizeof("--cpu-set=")-1 + PROPERTY_VALUE_MAX];

    char dex2oat_isa_variant_key[PROPERTY_KEY_MAX];

    char dex2oat_isa_variant[sizeof("--instruction-set-variant=") -1 + PROPERTY_VALUE_MAX];

    char dex2oat_isa_features_key[PROPERTY_KEY_MAX];
@@ -911,6 +913,10 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv, bool zygote, bool p 
    parseCompilerOption("dalvik.vm.dex2oat-threads", dex2oatThreadsBuf, "-j", "-Xcompiler-option");

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

                        "-Ximage-compiler-option");

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

                        "-Xcompiler-option");

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

                        "-Ximage-compiler-option");



    // The runtime will compile a boot image, when necessary, not using installd. Thus, we need to

    // pass the instruction-set-features/variant as an image-compiler-option.