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

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

am 2e706eb5: am f1c84568: am 2a20f425: Merge "Frameworks/base:... 

am 2e706eb5: am f1c84568: am 2a20f425: Merge "Frameworks/base: Compiled-classes support" into lmp-mr1-dev

* commit '2e706eb5':
  Frameworks/base: Compiled-classes support
parents 04b81ac0 2e706eb5

core/jni/AndroidRuntime.cpp

+6 −0
Original line number Diff line number Diff line
@@ -779,6 +779,12 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv) 
        addOption("-Ximage-compiler-option");

        addOption("--image-classes=/system/etc/preloaded-classes");



        // If there is a compiled-classes file, push it.

        if (hasFile("/system/etc/compiled-classes")) {

            addOption("-Ximage-compiler-option");

            addOption("--compiled-classes=/system/etc/compiled-classes");

        }



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

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