am 19275cb5: Merge "Remove code to pass the nonexistant lockprofsample flag to Dalvik." into froyo

Merge commit '19275cb5b028c18228674f87ba4cbc98d8520c5e' into froyo-plus-aosp

* commit '19275cb5b028c18228674f87ba4cbc98d8520c5e':
  Remove code to pass the nonexistant lockprofsample flag to Dalvik.
This commit is contained in:
Carl Shapiro
2010-04-20 11:48:09 -07:00
committed by Android Git Automerger

View File

@@ -712,15 +712,6 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv)
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)
/* Minimal profile threshold to trigger JIT compilation */
char jitThresholdBuf[sizeof("-Xjitthreshold:") + PROPERTY_VALUE_MAX];