From 5bc93866b089faa2feddf7b113afe915401d992f Mon Sep 17 00:00:00 2001 From: Brian Carlstrom Date: Wed, 28 May 2014 14:31:47 -0700 Subject: [PATCH] Move to dalvik.vm.lib.2 to force default to libart Bug: 14298175 (cherry-picked from commit 2ef5abb8d534f016582d6023054cbe69d8114b6b) Change-Id: Icd91982c09076e87092906106cbff4a81589e8de --- core/java/com/android/internal/app/ProcessStats.java | 2 +- core/jni/AndroidRuntime.cpp | 2 +- services/java/com/android/server/SystemServer.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/java/com/android/internal/app/ProcessStats.java b/core/java/com/android/internal/app/ProcessStats.java index a87992aeb341c..cd90cdb7cd9dc 100644 --- a/core/java/com/android/internal/app/ProcessStats.java +++ b/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; diff --git a/core/jni/AndroidRuntime.cpp b/core/jni/AndroidRuntime.cpp index fc6cc81cc8ee7..78885d24db7c7 100644 --- a/core/jni/AndroidRuntime.cpp +++ b/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) { diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index 8a3bc88412794..9926d2fabb3cd 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/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) {