diff options
| author | Brian Carlstrom <bdc@google.com> | 2014-07-30 15:13:17 -0700 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2014-08-06 22:25:01 -0700 |
| commit | ce5bbbea08e9dca963a208f5199aad699d4a854d (patch) | |
| tree | 365545c15a67ffd90498fa50a4f33871c1f1a264 /core/jni | |
| parent | 0d8fb019633300a6636f1bf99f0716e8579dab35 (diff) | |
| download | frameworks_base-ce5bbbea08e9dca963a208f5199aad699d4a854d.zip frameworks_base-ce5bbbea08e9dca963a208f5199aad699d4a854d.tar.gz frameworks_base-ce5bbbea08e9dca963a208f5199aad699d4a854d.tar.bz2 | |
Move image classes options from art to AndroidRuntime [frameworks/base]
Bug: 15165413
(cherry picked from commit 108166c749f0418d45f220419a9611c4afec1311)
Change-Id: Ib0d638ac3ca6668a5be04cdbdfd46740dabeceaa
Diffstat (limited to 'core/jni')
| -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 7be17ba..c4c4362 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"); |