From 69227b6687da0bf35ff54ed4793da98c3aa986ee 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. (cherry-picked from commit 13f37674983d4fd402dd8764ed4e0343a21e954d) Test: Boot with dalvik.vm.usejitprofiles=false Test: atest -a android.compilation.cts.AdbRootDependentCompilationTest#testCompile_curProfile Bug: 254434433 Merged-In: I27e0639ba71ea794a5770263c4d357c52531a99a Change-Id: I27e0639ba71ea794a5770263c4d357c52531a99a --- core/jni/AndroidRuntime.cpp | 6 +----- .../com/android/server/pm/PackageManagerShellCommand.java | 2 +- .../java/com/android/server/pm/dex/ArtManagerService.java | 6 ++---- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/core/jni/AndroidRuntime.cpp b/core/jni/AndroidRuntime.cpp index 949f363a58f09..7dd46a607569d 100644 --- a/core/jni/AndroidRuntime.cpp +++ b/core/jni/AndroidRuntime.cpp @@ -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, diff --git a/services/core/java/com/android/server/pm/PackageManagerShellCommand.java b/services/core/java/com/android/server/pm/PackageManagerShellCommand.java index 1e64701ebab78..89719ce99ac99 100644 --- a/services/core/java/com/android/server/pm/PackageManagerShellCommand.java +++ b/services/core/java/com/android/server/pm/PackageManagerShellCommand.java @@ -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; 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 af507cd376ddf..50253ead5ece2 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); }