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

Commit 617fc0c0 authored by Brian Carlstrom's avatar Brian Carlstrom Committed by Android (Google) Code Review
Browse files

Merge "Move to dalvik.vm.lib.2 to force default to libart" into lmp-preview-dev

parents c0398031 3c1ff826

core/java/com/android/internal/app/ProcessStats.java

+1 −1
Original line number Diff line number Diff line
@@ -1100,7 +1100,7 @@ public final class ProcessStats implements Parcelable { 


    public boolean evaluateSystemProperties(boolean update) {

        boolean changed = false;

        String runtime = SystemProperties.get("persist.sys.dalvik.vm.lib.1",

        String runtime = SystemProperties.get("persist.sys.dalvik.vm.lib.2",

                VMRuntime.getRuntime().vmLibrary());

        if (!Objects.equals(runtime, mRuntime)) {

            changed = true;

core/jni/AndroidRuntime.cpp

+1 −1
Original line number Diff line number Diff line
@@ -789,7 +789,7 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv) 
    }



    // libart tolerates libdvm flags, but not vice versa, so only pass some options if libart.

    property_get("persist.sys.dalvik.vm.lib.1", dalvikVmLibBuf, "libdvm.so");

    property_get("persist.sys.dalvik.vm.lib.2", dalvikVmLibBuf, "libart.so");

    bool libart = (strncmp(dalvikVmLibBuf, "libart", 6) == 0);



    if (libart) {

services/java/com/android/server/SystemServer.java

+1 −1
Original line number Diff line number Diff line
@@ -186,7 +186,7 @@ public final class SystemServer { 
        // had to fallback to a different runtime because it is

        // running as root and we need to be the system user to set

        // the property. http://b/11463182

        SystemProperties.set("persist.sys.dalvik.vm.lib.1", VMRuntime.getRuntime().vmLibrary());

        SystemProperties.set("persist.sys.dalvik.vm.lib.2", VMRuntime.getRuntime().vmLibrary());



        // Enable the sampling profiler.

        if (SamplingProfilerIntegration.isEnabled()) {