diff options
| author | Andreas Gampe <agampe@google.com> | 2014-11-18 22:57:02 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-18 22:57:02 +0000 |
| commit | 2e706eb5b7154044d1a22ed03738bba16867f745 (patch) | |
| tree | 3957a082063f9d3379c2b3abcb6de65ee66de4b4 /core/jni/AndroidRuntime.cpp | |
| parent | 01dbe7397642836107c2189e36e7387e354081fd (diff) | |
| parent | f1c84568bc48d51ace404452c9e18250c4d36de4 (diff) | |
| download | frameworks_base-2e706eb5b7154044d1a22ed03738bba16867f745.zip frameworks_base-2e706eb5b7154044d1a22ed03738bba16867f745.tar.gz frameworks_base-2e706eb5b7154044d1a22ed03738bba16867f745.tar.bz2 | |
am f1c84568: am 2a20f425: Merge "Frameworks/base: Compiled-classes support" into lmp-mr1-dev
* commit 'f1c84568bc48d51ace404452c9e18250c4d36de4':
Frameworks/base: Compiled-classes support
Diffstat (limited to 'core/jni/AndroidRuntime.cpp')
| -rw-r--r-- | core/jni/AndroidRuntime.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/core/jni/AndroidRuntime.cpp b/core/jni/AndroidRuntime.cpp index 9fa71ac..5352135 100644 --- a/core/jni/AndroidRuntime.cpp +++ b/core/jni/AndroidRuntime.cpp @@ -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"); |