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

Commit c40ba07d authored by Martin Stjernholm's avatar Martin Stjernholm Committed by Android (Google) Code Review
Browse files

Merge "Remove dalvik.vm.usejitprofiles system property."

parents 875a53cf 13f37674

core/jni/AndroidRuntime.cpp

+1 −5
Original line number Diff line number Diff line
@@ -645,7 +645,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];
@@ -860,10 +859,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/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);

        }