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

Commit f59fb28c authored by Andreas Gampe's avatar Andreas Gampe
Browse files

Frameworks/base: Compiled-classes support

Let AndroidRuntime check for /system/etc/compiled-classes and push
it to the runtime for boot image creation.

Bug: 18410571

(cherry picked from commit ca775941)

Change-Id: I2510316381f2661166af24d7e14b013f4e045556
parent a58336f6
Loading
Loading
Loading
Loading
+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");