drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am ec4c7752: am ab97d617: Merge "Only pass -Xprofile-* options to ART"

Browse Source 
* commit 'ec4c7752c22ae26924378d953a6f4a0e8e8b036d':
  Only pass -Xprofile-* options to ART
This commit is contained in:
Brian Carlstrom
2014-03-10 17:51:05 +00:00
committed by Android Git Automerger
parent 8272c84cb5 ec4c7752c2
commit 9e73672362
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/jni/AndroidRuntime.cpp
View File

@ -749,10 +749,11 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv)
mOptions.add(opt); mOptions.add(opt);
} }
// libart tolerates libdvm flags, but not vice versa, so only pass these if libart. // libart tolerates libdvm flags, but not vice versa, so only pass some options if libart.
property_get("persist.sys.dalvik.vm.lib.1", dalvikVmLibBuf, "libdvm.so"); property_get("persist.sys.dalvik.vm.lib.1", dalvikVmLibBuf, "libdvm.so");
if (strncmp(dalvikVmLibBuf, "libart", 6) == 0) { bool libart = (strncmp(dalvikVmLibBuf, "libart", 6) == 0);
if (libart) {
// Extra options for DexClassLoader. // Extra options for DexClassLoader.
property_get("dalvik.vm.dex2oat-flags", dex2oatFlagsBuf, ""); property_get("dalvik.vm.dex2oat-flags", dex2oatFlagsBuf, "");
parseExtraOpts(dex2oatFlagsBuf, "-Xcompiler-option"); parseExtraOpts(dex2oatFlagsBuf, "-Xcompiler-option");
@ -783,7 +784,7 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv)
/* /*
* Set profiler options * Set profiler options
*/ */
{ if (libart) {
char period[sizeof("-Xprofile-period:") + PROPERTY_VALUE_MAX]; char period[sizeof("-Xprofile-period:") + PROPERTY_VALUE_MAX];
char duration[sizeof("-Xprofile-duration:") + PROPERTY_VALUE_MAX]; char duration[sizeof("-Xprofile-duration:") + PROPERTY_VALUE_MAX];
char interval[sizeof("-Xprofile-interval:") + PROPERTY_VALUE_MAX]; char interval[sizeof("-Xprofile-interval:") + PROPERTY_VALUE_MAX];