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

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

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

* commit '2a20f425':
  Frameworks/base: Compiled-classes support
parents 0acbed25 2a20f425
Loading
Loading
Loading
Loading
+6 −0
Original line number Diff line number Diff line
@@ -787,6 +787,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");