diff options
| author | 2015-04-02 20:57:52 +0000 | |
|---|---|---|
| committer | 2015-04-02 20:57:53 +0000 | |
| commit | fb397cf827d2f0c2e1a2aca496c75752da11bc3f (patch) | |
| tree | e444088afa2adb474decf319dbeb82ea4e289d1b | |
| parent | f99a16c943a4366bdfdba19534457f9e45538f7d (diff) | |
| parent | 74ad30f969e1356cdd4e4c0acf1e064250389e04 (diff) | |
Merge "Frameworks/base: Support dex2oat threads system property" into lmp-mr1-modular-dev
| -rw-r--r-- | core/jni/AndroidRuntime.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/core/jni/AndroidRuntime.cpp b/core/jni/AndroidRuntime.cpp index 1fbd4a113720..8dd447c9d436 100644 --- a/core/jni/AndroidRuntime.cpp +++ b/core/jni/AndroidRuntime.cpp @@ -553,6 +553,8 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv) char dex2oatXmxFlagsBuf[sizeof("-Xmx")-1 + PROPERTY_VALUE_MAX]; char dex2oatCompilerFilterBuf[sizeof("--compiler-filter=")-1 + PROPERTY_VALUE_MAX]; char dex2oatImageCompilerFilterBuf[sizeof("--compiler-filter=")-1 + PROPERTY_VALUE_MAX]; + char dex2oatThreadsBuf[sizeof("-j")-1 + PROPERTY_VALUE_MAX]; + char dex2oatThreadsImageBuf[sizeof("-j")-1 + PROPERTY_VALUE_MAX]; char dex2oatFlagsBuf[PROPERTY_VALUE_MAX]; char dex2oatImageFlagsBuf[PROPERTY_VALUE_MAX]; char extraOptsBuf[PROPERTY_VALUE_MAX]; @@ -812,6 +814,9 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv) parseExtraOpts(dex2oatFlagsBuf, "-Xcompiler-option"); } + parseCompilerOption("dalvik.vm.dex2oat-threads", dex2oatThreadsBuf, "-j", "-Xcompiler-option"); + parseCompilerOption("dalvik.vm.image-dex2oat-threads", dex2oatThreadsImageBuf, "-j", + "-Ximage-compiler-option"); /* extra options; parse this late so it overrides others */ property_get("dalvik.vm.extra-opts", extraOptsBuf, ""); |