Merge "Remove dalvik.vm.usejitprofiles system property."
This commit is contained in:
@@ -640,7 +640,6 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv, bool zygote, bool p
|
||||
char jitmaxsizeOptsBuf[sizeof("-Xjitmaxsize:")-1 + PROPERTY_VALUE_MAX];
|
||||
char jitinitialsizeOptsBuf[sizeof("-Xjitinitialsize:")-1 + PROPERTY_VALUE_MAX];
|
||||
char jitthresholdOptsBuf[sizeof("-Xjitthreshold:")-1 + PROPERTY_VALUE_MAX];
|
||||
char useJitProfilesOptsBuf[sizeof("-Xjitsaveprofilinginfo:")-1 + PROPERTY_VALUE_MAX];
|
||||
char jitprithreadweightOptBuf[sizeof("-Xjitprithreadweight:")-1 + PROPERTY_VALUE_MAX];
|
||||
char jittransitionweightOptBuf[sizeof("-Xjittransitionweight:")-1 + PROPERTY_VALUE_MAX];
|
||||
char hotstartupsamplesOptsBuf[sizeof("-Xps-hot-startup-method-samples:")-1 + PROPERTY_VALUE_MAX];
|
||||
@@ -856,10 +855,7 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv, bool zygote, bool p
|
||||
parseRuntimeOption("dalvik.vm.jitpthreadpriority",
|
||||
jitpthreadpriorityOptsBuf,
|
||||
"-Xjitpthreadpriority:");
|
||||
property_get("dalvik.vm.usejitprofiles", useJitProfilesOptsBuf, "");
|
||||
if (strcmp(useJitProfilesOptsBuf, "true") == 0) {
|
||||
addOption("-Xjitsaveprofilinginfo");
|
||||
}
|
||||
addOption("-Xjitsaveprofilinginfo");
|
||||
|
||||
parseRuntimeOption("dalvik.vm.jitprithreadweight",
|
||||
jitprithreadweightOptBuf,
|
||||
|
||||
@@ -1772,7 +1772,7 @@ class PackageManagerShellCommand extends ShellCommand {
|
||||
|
||||
private int runCompile() throws RemoteException {
|
||||
final PrintWriter pw = getOutPrintWriter();
|
||||
boolean checkProfiles = SystemProperties.getBoolean("dalvik.vm.usejitprofiles", false);
|
||||
boolean checkProfiles = true;
|
||||
boolean forceCompilation = false;
|
||||
boolean allPackages = false;
|
||||
boolean clearProfileData = false;
|
||||
|
||||
@@ -320,15 +320,13 @@ public class ArtManagerService extends android.content.pm.dex.IArtManager.Stub {
|
||||
|
||||
switch (profileType) {
|
||||
case ArtManager.PROFILE_APPS :
|
||||
return SystemProperties.getBoolean("dalvik.vm.usejitprofiles", false);
|
||||
return true;
|
||||
case ArtManager.PROFILE_BOOT_IMAGE:
|
||||
// The device config property overrides the system property version.
|
||||
boolean profileBootClassPath = SystemProperties.getBoolean(
|
||||
"persist.device_config.runtime_native_boot.profilebootclasspath",
|
||||
SystemProperties.getBoolean("dalvik.vm.profilebootclasspath", false));
|
||||
return (Build.IS_USERDEBUG || Build.IS_ENG) &&
|
||||
SystemProperties.getBoolean("dalvik.vm.usejitprofiles", false) &&
|
||||
profileBootClassPath;
|
||||
return (Build.IS_USERDEBUG || Build.IS_ENG) && profileBootClassPath;
|
||||
default:
|
||||
throw new IllegalArgumentException("Invalid profile type:" + profileType);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user