summaryrefslogtreecommitdiffstats
path: root/core/jni
diff options
context:
space:
mode:
authorBrian Carlstrom <bdc@google.com>2014-05-28 14:31:47 -0700
committerBrian Carlstrom <bdc@google.com>2014-05-28 14:31:47 -0700
commit3c1ff826e0abdffdd76129bf974abb96444dade8 (patch)
tree89fac1cb9092ca7514c4a0ce207fa57341366210 /core/jni
parentb9a65de1f79d92326abcccc295c18f24afb83053 (diff)
downloadframeworks_base-3c1ff826e0abdffdd76129bf974abb96444dade8.zip
frameworks_base-3c1ff826e0abdffdd76129bf974abb96444dade8.tar.gz
frameworks_base-3c1ff826e0abdffdd76129bf974abb96444dade8.tar.bz2
Move to dalvik.vm.lib.2 to force default to libart
Bug: 14298175 Change-Id: I8afa91bddfb6fec6b61c39286a16594eb947830e
Diffstat (limited to 'core/jni')
-rw-r--r--core/jni/AndroidRuntime.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/jni/AndroidRuntime.cpp b/core/jni/AndroidRuntime.cpp
index 0c7eefa..e069876 100644
--- a/core/jni/AndroidRuntime.cpp
+++ b/core/jni/AndroidRuntime.cpp
@@ -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) {