diff options
| author | Brian Carlstrom <bdc@google.com> | 2014-05-28 21:39:28 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-28 21:39:29 +0000 |
| commit | 617fc0c051ec05fb477df09888d9b15e53355248 (patch) | |
| tree | 70873aac23655783d0f1c125a157c1fe78e533dc | |
| parent | c039803160c692216d6dff874ba0af0fb0dc3ee0 (diff) | |
| parent | 3c1ff826e0abdffdd76129bf974abb96444dade8 (diff) | |
| download | frameworks_base-617fc0c051ec05fb477df09888d9b15e53355248.zip frameworks_base-617fc0c051ec05fb477df09888d9b15e53355248.tar.gz frameworks_base-617fc0c051ec05fb477df09888d9b15e53355248.tar.bz2 | |
Merge "Move to dalvik.vm.lib.2 to force default to libart" into lmp-preview-dev
| -rw-r--r-- | core/java/com/android/internal/app/ProcessStats.java | 2 | ||||
| -rw-r--r-- | core/jni/AndroidRuntime.cpp | 2 | ||||
| -rw-r--r-- | 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 41f3337..7e11850 100644 --- a/core/java/com/android/internal/app/ProcessStats.java +++ b/core/java/com/android/internal/app/ProcessStats.java @@ -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; 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) { diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index bc34e0e..0f24ff6 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -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()) { |