From 13f37674983d4fd402dd8764ed4e0343a21e954d Mon Sep 17 00:00:00 2001 From: Martin Stjernholm Date: Sat, 12 Nov 2022 23:24:34 +0000 Subject: [PATCH] Remove dalvik.vm.usejitprofiles system property. Disabling profiles is no longer supported. Most of the profile support has been active even when this property was false, and it won't be supported in the ART Service. Test: Boot with dalvik.vm.usejitprofiles=false Bug: 254434433 Change-Id: I27e0639ba71ea794a5770263c4d357c52531a99a --- core/jni/AndroidRuntime.cpp | 6 +----- .../java/com/android/server/pm/dex/ArtManagerService.java | 6 ++---- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/core/jni/AndroidRuntime.cpp b/core/jni/AndroidRuntime.cpp index 0798110134f8e..ee48412e53e15 100644 --- a/core/jni/AndroidRuntime.cpp +++ b/core/jni/AndroidRuntime.cpp @@ -643,7 +643,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]; @@ -858,10 +857,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, diff --git a/services/core/java/com/android/server/pm/dex/ArtManagerService.java b/services/core/java/com/android/server/pm/dex/ArtManagerService.java index 0bdd98038f837..046db921e245a 100644 --- a/services/core/java/com/android/server/pm/dex/ArtManagerService.java +++ b/services/core/java/com/android/server/pm/dex/ArtManagerService.java @@ -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); }