diff options
| author | David Srbecky <dsrbecky@google.com> | 2015-05-28 20:16:49 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-05-28 20:16:49 +0000 |
| commit | 17ef84d780a22748257f7d2f8512c5233c8f79c1 (patch) | |
| tree | 4dfaf79c16d2b6e0fca93a3ebd0a43eb9484bc3f /cmds | |
| parent | 4808980eecf8f80bf0f033241171bf9075ba74ab (diff) | |
| parent | 867dc18e6f48c56cb7fd545c3d2e96c6abb9895b (diff) | |
| download | frameworks_native-17ef84d780a22748257f7d2f8512c5233c8f79c1.zip frameworks_native-17ef84d780a22748257f7d2f8512c5233c8f79c1.tar.gz frameworks_native-17ef84d780a22748257f7d2f8512c5233c8f79c1.tar.bz2 | |
am 867dc18e: am 9405746d: Merge "Rename --include-cfi to --generate-debug-info."
* commit '867dc18e6f48c56cb7fd545c3d2e96c6abb9895b':
Rename --include-cfi to --generate-debug-info.
Diffstat (limited to 'cmds')
| -rw-r--r-- | cmds/installd/commands.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cmds/installd/commands.cpp b/cmds/installd/commands.cpp index 937f6a0..eaec5a2 100644 --- a/cmds/installd/commands.cpp +++ b/cmds/installd/commands.cpp @@ -815,7 +815,7 @@ static void run_dex2oat(int zip_fd, int oat_fd, const char* input_file_name, (strcmp(vold_decrypt, "1") == 0))); bool use_jit = check_boolean_property("debug.usejit"); - bool gen_cfi = check_boolean_property("debug.gencfi"); + bool generate_debug_info = check_boolean_property("debug.generate-debug-info"); static const char* DEX2OAT_BIN = "/system/bin/dex2oat"; @@ -908,7 +908,7 @@ static void run_dex2oat(int zip_fd, int oat_fd, const char* input_file_name, + (have_dex2oat_threads_flag ? 1 : 0) + (have_dex2oat_swap_fd ? 1 : 0) + (have_dex2oat_relocation_skip_flag ? 2 : 0) - + (gen_cfi ? 1 : 0) + + (generate_debug_info ? 1 : 0) + (debuggable ? 1 : 0) + dex2oat_flags_count]; int i = 0; @@ -947,8 +947,8 @@ static void run_dex2oat(int zip_fd, int oat_fd, const char* input_file_name, if (have_dex2oat_swap_fd) { argv[i++] = dex2oat_swap_fd; } - if (gen_cfi) { - argv[i++] = "--include-cfi"; + if (generate_debug_info) { + argv[i++] = "--generate-debug-info"; } if (debuggable) { argv[i++] = "--debuggable"; |