diff options
| author | Brian Carlstrom <bdc@google.com> | 2013-06-30 13:17:38 -0700 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2013-07-10 09:51:20 -0700 |
| commit | e7a8b17e37ef359567fbbd9beb8c2445494f6402 (patch) | |
| tree | c3b61c0b7c7e710d0f2d99e74209647df7029c64 /cmds | |
| parent | 5cd46aa3399ddeaf12a211390dfde66c796ab299 (diff) | |
| download | frameworks_native-e7a8b17e37ef359567fbbd9beb8c2445494f6402.zip frameworks_native-e7a8b17e37ef359567fbbd9beb8c2445494f6402.tar.gz frameworks_native-e7a8b17e37ef359567fbbd9beb8c2445494f6402.tar.bz2 | |
Renaming dalvik.vm.lib to persist.sys.dalvik.vm.lib
Change-Id: If31695e04bb813eb75b2fdd00e5d70ced4fbb0e9
Diffstat (limited to 'cmds')
| -rw-r--r-- | cmds/installd/commands.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/cmds/installd/commands.c b/cmds/installd/commands.c index 131e03f..27580f3 100644 --- a/cmds/installd/commands.c +++ b/cmds/installd/commands.c @@ -656,7 +656,7 @@ int dexopt(const char *apk_path, uid_t uid, int is_public) struct stat apk_stat, dex_stat; char out_path[PKG_PATH_MAX]; char dexopt_flags[PROPERTY_VALUE_MAX]; - char dalvik_vm_lib[PROPERTY_VALUE_MAX]; + char persist_sys_dalvik_vm_lib[PROPERTY_VALUE_MAX]; char *end; int res, zip_fd=-1, out_fd=-1; @@ -668,9 +668,8 @@ int dexopt(const char *apk_path, uid_t uid, int is_public) property_get("dalvik.vm.dexopt-flags", dexopt_flags, ""); ALOGV("dalvik.vm.dexopt_flags=%s\n", dexopt_flags); - /* The command to run depend ones the value of dalvik.vm.lib */ - property_get("dalvik.vm.lib", dalvik_vm_lib, "libdvm.so"); - ALOGV("dalvik.vm.lib=%s\n", dalvik_vm_lib); + /* 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"); /* Before anything else: is there a .odex file? If so, we have * precompiled the apk and there is nothing to do here. @@ -739,12 +738,12 @@ int dexopt(const char *apk_path, uid_t uid, int is_public) exit(67); } - if (strncmp(dalvik_vm_lib, "libdvm", 6) == 0) { + if (strncmp(persist_sys_dalvik_vm_lib, "libdvm", 6) == 0) { run_dexopt(zip_fd, out_fd, apk_path, out_path, dexopt_flags); - } else if (strncmp(dalvik_vm_lib, "libart", 6) == 0) { + } else if (strncmp(persist_sys_dalvik_vm_lib, "libart", 6) == 0) { run_dex2oat(zip_fd, out_fd, apk_path, out_path, dexopt_flags); } else { - exit(69); /* Unexpected dalvik.vm.lib value */ + exit(69); /* Unexpected persist.sys.dalvik.vm.lib value */ } exit(68); /* only get here on exec failure */ } else { |