diff options
| author | Brian Carlstrom <bdc@google.com> | 2014-05-28 22:31:39 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-28 22:31:39 +0000 |
| commit | 452c592191a147ae1175db775bc3e7e8e0311855 (patch) | |
| tree | 49d3f9b47135cf0eb108b1539de5a42e6a386761 /services/java | |
| parent | df0e9ed5536e2cab860f3ecf9dab0030a471766e (diff) | |
| parent | 197565e0e800be3c731e679914f40afa1aab98fd (diff) | |
| download | frameworks_base-452c592191a147ae1175db775bc3e7e8e0311855.zip frameworks_base-452c592191a147ae1175db775bc3e7e8e0311855.tar.gz frameworks_base-452c592191a147ae1175db775bc3e7e8e0311855.tar.bz2 | |
am 197565e0: Merge "Move to dalvik.vm.lib.2 to force default to libart"
* commit '197565e0e800be3c731e679914f40afa1aab98fd':
Move to dalvik.vm.lib.2 to force default to libart
Diffstat (limited to 'services/java')
| -rw-r--r-- | services/java/com/android/server/SystemServer.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index 8a3bc88..9926d2f 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) { |