summaryrefslogtreecommitdiffstats
path: root/cmds
diff options
context:
space:
mode:
authorDavid Srbecky <dsrbecky@google.com>2015-05-28 16:55:50 +0100
committerDavid Srbecky <dsrbecky@google.com>2015-05-28 16:55:50 +0100
commit741a6ff2e264b96edbca3ac95e720b21c8e39382 (patch)
treeb06270d704b5d3ca9422bbc9089b311dd4db317d /cmds
parent738fc3a722cc2c753b591298e70b0f86c481bba2 (diff)
downloadframeworks_native-741a6ff2e264b96edbca3ac95e720b21c8e39382.zip
frameworks_native-741a6ff2e264b96edbca3ac95e720b21c8e39382.tar.gz
frameworks_native-741a6ff2e264b96edbca3ac95e720b21c8e39382.tar.bz2
Rename --include-cfi to --generate-debug-info.
This follows a change in dex2oat. Change-Id: I6b2df1668fdd09d82cfe86e6e51360b954b6c8a9
Diffstat (limited to 'cmds')
-rw-r--r--cmds/installd/commands.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/cmds/installd/commands.cpp b/cmds/installd/commands.cpp
index 6aa2bb4..ca04b49 100644
--- a/cmds/installd/commands.cpp
+++ b/cmds/installd/commands.cpp
@@ -754,7 +754,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";
@@ -847,7 +847,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;
@@ -886,8 +886,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";