Merge "Move to dalvik.vm.lib.2 to force default to libart"

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

@@ -1046,7 +1046,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

@@ -778,7 +778,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

@@ -1146,7 +1146,7 @@ public class SystemServer {
          * 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",
+        SystemProperties.set("persist.sys.dalvik.vm.lib.2",
                              VMRuntime.getRuntime().vmLibrary());
 
         if (System.currentTimeMillis() < EARLIEST_SUPPORTED_TIME) {