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

Commit ce5bbbea authored by Brian Carlstrom's avatar Brian Carlstrom
Browse files

Move image classes options from art to AndroidRuntime [frameworks/base] 

Bug: 15165413

(cherry picked from commit 108166c7)

Change-Id: Ib0d638ac3ca6668a5be04cdbdfd46740dabeceaa
parent 0d8fb019

core/jni/AndroidRuntime.cpp

+4 −0
Original line number Diff line number Diff line
@@ -789,6 +789,10 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv) 
            parseCompilerOption("dalvik.vm.image-dex2oat-filter", dex2oatImageCompilerFilterBuf,

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

        }

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

        addOption("--image-classes-zip=/system/framework/framework.jar");

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

        addOption("--image-classes=preloaded-classes");

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

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