From 74ad30f969e1356cdd4e4c0acf1e064250389e04 Mon Sep 17 00:00:00 2001 From: Andreas Gampe Date: Mon, 30 Mar 2015 18:43:39 -0700 Subject: Frameworks/base: Support dex2oat threads system property Check dalvik.vm.dex2oat-threads in AndroidRuntime and pass to ART with "-j" as a compiler option, if found. Check dalvik.vm.image-dex2oat-threads in AndroidRuntime and pass to ART with "-j" as an image compiler option, if found. Bug: 19992386 (cherry picked from commit e0352388238875ef7e7b31d914fc903b08ff0f6b) Change-Id: I5e7806cf560607d31a1d6901dffb14bee538c9cc --- core/jni/AndroidRuntime.cpp | 5 +++++ 1 file changed, 5 insertions(+) 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, ""); -- cgit v1.2.3-59-g8ed1b