From ce5bbbea08e9dca963a208f5199aad699d4a854d Mon Sep 17 00:00:00 2001 From: Brian Carlstrom Date: Wed, 30 Jul 2014 15:13:17 -0700 Subject: [PATCH] Move image classes options from art to AndroidRuntime [frameworks/base] Bug: 15165413 (cherry picked from commit 108166c749f0418d45f220419a9611c4afec1311) Change-Id: Ib0d638ac3ca6668a5be04cdbdfd46740dabeceaa --- core/jni/AndroidRuntime.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/core/jni/AndroidRuntime.cpp b/core/jni/AndroidRuntime.cpp index 7be17ba0bcaaa..c4c4362fd70a1 100644 --- a/core/jni/AndroidRuntime.cpp +++ b/core/jni/AndroidRuntime.cpp @@ -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");