ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am 867dc18e: am 9405746d: Merge "Rename --include-cfi to --generate-debug-info."

Browse Source 
* commit '867dc18e6f48c56cb7fd545c3d2e96c6abb9895b':
  Rename --include-cfi to --generate-debug-info.
This commit is contained in:
David Srbecky 2015-05-28 20:16:49 +00:00 committed by Android Git Automerger
commit 17ef84d780
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmds/installd/commands.cpp
View File

@ -815,7 +815,7 @@ static void run_dex2oat(int zip_fd, int oat_fd, const char* input_file_name,
(strcmp(vold_decrypt, "1") == 0))); (strcmp(vold_decrypt, "1") == 0)));
bool use_jit = check_boolean_property("debug.usejit"); 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"; 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_threads_flag ? 1 : 0)
+ (have_dex2oat_swap_fd ? 1 : 0) + (have_dex2oat_swap_fd ? 1 : 0)
+ (have_dex2oat_relocation_skip_flag ? 2 : 0) + (have_dex2oat_relocation_skip_flag ? 2 : 0)
+ (gen_cfi ? 1 : 0) + (generate_debug_info ? 1 : 0)
+ (debuggable ? 1 : 0) + (debuggable ? 1 : 0)
+ dex2oat_flags_count]; + dex2oat_flags_count];
int i = 0; 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) { if (have_dex2oat_swap_fd) {
argv[i++] = dex2oat_swap_fd; argv[i++] = dex2oat_swap_fd;
} }
if (gen_cfi) { if (generate_debug_info) {
argv[i++] = "--include-cfi"; argv[i++] = "--generate-debug-info";
} }
if (debuggable) { if (debuggable) {
argv[i++] = "--debuggable"; argv[i++] = "--debuggable";