Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 69227b66 authored by Martin Stjernholm's avatar Martin Stjernholm
Browse files

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 13f37674)

Test: Boot with dalvik.vm.usejitprofiles=false
Test: atest -a android.compilation.cts.AdbRootDependentCompilationTest#testCompile_curProfile
Bug: 254434433
Merged-In: I27e0639ba71ea794a5770263c4d357c52531a99a
Change-Id: I27e0639ba71ea794a5770263c4d357c52531a99a
parent 52d2b21a

core/jni/AndroidRuntime.cpp

+1 −5
Original line number Diff line number Diff line
@@ -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");

    }



    parseRuntimeOption("dalvik.vm.jitprithreadweight",

                       jitprithreadweightOptBuf,

services/core/java/com/android/server/pm/PackageManagerShellCommand.java

+1 −1
Original line number Diff line number Diff line
@@ -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;

services/core/java/com/android/server/pm/dex/ArtManagerService.java

+2 −4
Original line number Diff line number Diff line
@@ -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);

        }