am 15feb4de: am 19275cb5: Merge "Remove code to pass the nonexistant lockprofsample flag to Dalvik." into froyo
Merge commit '15feb4defc61c7bded6fdd3ea1c3781f25666275' into kraken * commit '15feb4defc61c7bded6fdd3ea1c3781f25666275': Remove code to pass the nonexistant lockprofsample flag to Dalvik.
This commit is contained in:
@@ -711,15 +711,6 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv)
|
|||||||
mOptions.add(opt);
|
mOptions.add(opt);
|
||||||
}
|
}
|
||||||
|
|
||||||
char lockProfSampleBuf[sizeof("-Xlockprofsample:") + sizeof(propBuf)];
|
|
||||||
property_get("dalvik.vm.lockprof.sample", propBuf, "");
|
|
||||||
if (strlen(propBuf) > 0) {
|
|
||||||
strcpy(lockProfSampleBuf, "-Xlockprofsample:");
|
|
||||||
strcat(lockProfSampleBuf, propBuf);
|
|
||||||
opt.optionString = lockProfSampleBuf;
|
|
||||||
mOptions.add(opt);
|
|
||||||
}
|
|
||||||
|
|
||||||
#if defined(WITH_JIT)
|
#if defined(WITH_JIT)
|
||||||
/* Minimal profile threshold to trigger JIT compilation */
|
/* Minimal profile threshold to trigger JIT compilation */
|
||||||
char jitThresholdBuf[sizeof("-Xjitthreshold:") + PROPERTY_VALUE_MAX];
|
char jitThresholdBuf[sizeof("-Xjitthreshold:") + PROPERTY_VALUE_MAX];
|
||||||
|
|||||||
Reference in New Issue
Block a user