am af3efe8c: Merge "frameworks/native: Rename persist.sys.dalvik.vm.lib to allow new default"

* commit 'af3efe8ce7e2eeb7a98552af5cf38d8a9720f018':
  frameworks/native: Rename persist.sys.dalvik.vm.lib to allow new default
This commit is contained in:
Brian Carlstrom 2014-03-07 00:37:20 +00:00 committed by Android Git Automerger
commit 08732ff438

View File

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