Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Brian Carlstrom
2014-05-28 22:28:39 +00:00
committed by Gerrit Code Review
parent 862be91276 5bc93866b0
commit 197565e0e8
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/com/android/internal/app/ProcessStats.java
View File

@@ -1046,7 +1046,7 @@ public final class ProcessStats implements Parcelable {
public boolean evaluateSystemProperties(boolean update) { public boolean evaluateSystemProperties(boolean update) {
boolean changed = false; 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()); VMRuntime.getRuntime().vmLibrary());
if (!Objects.equals(runtime, mRuntime)) { if (!Objects.equals(runtime, mRuntime)) {
changed = true; changed = true;

2
core/jni/AndroidRuntime.cpp
View File

@@ -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. // 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); bool libart = (strncmp(dalvikVmLibBuf, "libart", 6) == 0);
if (libart) { if (libart) {

2
services/java/com/android/server/SystemServer.java
View File

@@ -1146,7 +1146,7 @@ public class SystemServer {
* running as root and we need to be the system user to set * running as root and we need to be the system user to set
* the property. http://b/11463182 * the property. http://b/11463182
*/ */
SystemProperties.set("persist.sys.dalvik.vm.lib.1", SystemProperties.set("persist.sys.dalvik.vm.lib.2",
VMRuntime.getRuntime().vmLibrary()); VMRuntime.getRuntime().vmLibrary());
if (System.currentTimeMillis() < EARLIEST_SUPPORTED_TIME) { if (System.currentTimeMillis() < EARLIEST_SUPPORTED_TIME) {