am e67810fd: am 97a51ad4: Merge "Move to dalvik.vm.lib.2 to force default to libart"

* commit 'e67810fd7a00ffa92337c6f3aa6114136ce12613':
  Move to dalvik.vm.lib.2 to force default to libart
This commit is contained in:
Brian Carlstrom 2014-05-28 23:13:27 +00:00 committed by Android Git Automerger
commit 28ec03035d

View File

@ -692,7 +692,7 @@ int dexopt(const char *apk_path, uid_t uid, int is_public,
}
/* The command to run depend on the value of persist.sys.dalvik.vm.lib */
property_get("persist.sys.dalvik.vm.lib.1", persist_sys_dalvik_vm_lib, "libdvm.so");
property_get("persist.sys.dalvik.vm.lib.2", persist_sys_dalvik_vm_lib, "libart.so");
/* Before anything else: is there a .odex file? If so, we have
* precompiled the apk and there is nothing to do here.