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

* commit '97a51ad44ae3dcf4976076382923ddcae16233ee':
  Move to dalvik.vm.lib.2 to force default to libart
This commit is contained in:
Brian Carlstrom 2014-05-28 22:31:43 +00:00 committed by Android Git Automerger
commit e67810fd7a

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 */ /* 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 /* Before anything else: is there a .odex file? If so, we have
* precompiled the apk and there is nothing to do here. * precompiled the apk and there is nothing to do here.