diff options
| author | Brian Carlstrom <bdc@google.com> | 2014-07-30 15:13:17 -0700 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2014-07-31 14:27:29 -0700 |
| commit | 108166c749f0418d45f220419a9611c4afec1311 (patch) | |
| tree | 6156d9616c8e00d8cc214bbcd5408745d3e26603 | |
| parent | 4fd561637a173c7fa6a1d71e9115db1db90514ff (diff) | |
| download | base-108166c749f0418d45f220419a9611c4afec1311.tar.gz | |
Move image classes options from art to AndroidRuntime [frameworks/base]
Bug: 15165413
Change-Id: I69c064b05f62a2e8a3801dc924f5b032dedc8e51
| -rw-r--r-- | core/jni/AndroidRuntime.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/core/jni/AndroidRuntime.cpp b/core/jni/AndroidRuntime.cpp index fea4eb00be9e..ea3cbee26c0d 100644 --- a/core/jni/AndroidRuntime.cpp +++ b/core/jni/AndroidRuntime.cpp @@ -783,6 +783,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"); |