Remove the --gen-gdb-info compiler option.
It is never used. We generally use --include-debug-symbols instead.
Change-Id: I933495cd85ab4f7dfcf3ef3cd2d943d4b870ffeb
diff --git a/compiler/dex/quick/quick_cfi_test.cc b/compiler/dex/quick/quick_cfi_test.cc
index 2e62166..6928acb 100644
--- a/compiler/dex/quick/quick_cfi_test.cc
+++ b/compiler/dex/quick/quick_cfi_test.cc
@@ -56,7 +56,6 @@
CompilerOptions::kDefaultSmallMethodThreshold,
CompilerOptions::kDefaultTinyMethodThreshold,
CompilerOptions::kDefaultNumDexMethodsThreshold,
- true, // generate_gdb_information.
false,
CompilerOptions::kDefaultTopKProfileThreshold,
false,
diff --git a/compiler/driver/compiler_options.cc b/compiler/driver/compiler_options.cc
index fc00c92..de1f958 100644
--- a/compiler/driver/compiler_options.cc
+++ b/compiler/driver/compiler_options.cc
@@ -27,7 +27,6 @@
small_method_threshold_(kDefaultSmallMethodThreshold),
tiny_method_threshold_(kDefaultTinyMethodThreshold),
num_dex_methods_threshold_(kDefaultNumDexMethodsThreshold),
- generate_gdb_information_(false),
include_patch_information_(kDefaultIncludePatchInformation),
top_k_profile_threshold_(kDefaultTopKProfileThreshold),
debuggable_(false),
@@ -53,7 +52,6 @@
size_t small_method_threshold,
size_t tiny_method_threshold,
size_t num_dex_methods_threshold,
- bool generate_gdb_information,
bool include_patch_information,
double top_k_profile_threshold,
bool debuggable,
@@ -73,7 +71,6 @@
small_method_threshold_(small_method_threshold),
tiny_method_threshold_(tiny_method_threshold),
num_dex_methods_threshold_(num_dex_methods_threshold),
- generate_gdb_information_(generate_gdb_information),
include_patch_information_(include_patch_information),
top_k_profile_threshold_(top_k_profile_threshold),
debuggable_(debuggable),
diff --git a/compiler/driver/compiler_options.h b/compiler/driver/compiler_options.h
index f7ea385..aa0db5d 100644
--- a/compiler/driver/compiler_options.h
+++ b/compiler/driver/compiler_options.h
@@ -61,7 +61,6 @@
size_t small_method_threshold,
size_t tiny_method_threshold,
size_t num_dex_methods_threshold,
- bool generate_gdb_information,
bool include_patch_information,
double top_k_profile_threshold,
bool debuggable,
@@ -162,10 +161,6 @@
return implicit_suspend_checks_;
}
- bool GetGenerateGDBInformation() const {
- return generate_gdb_information_;
- }
-
bool GetIncludePatchInformation() const {
return include_patch_information_;
}
@@ -207,7 +202,6 @@
const size_t small_method_threshold_;
const size_t tiny_method_threshold_;
const size_t num_dex_methods_threshold_;
- const bool generate_gdb_information_;
const bool include_patch_information_;
// When using a profile file only the top K% of the profiled samples will be compiled.
const double top_k_profile_threshold_;
diff --git a/compiler/jit/jit_compiler.cc b/compiler/jit/jit_compiler.cc
index df5d5cc..cef9db2 100644
--- a/compiler/jit/jit_compiler.cc
+++ b/compiler/jit/jit_compiler.cc
@@ -71,7 +71,6 @@
CompilerOptions::kDefaultTinyMethodThreshold,
CompilerOptions::kDefaultNumDexMethodsThreshold,
false,
- false,
CompilerOptions::kDefaultTopKProfileThreshold,
false, // TODO: Think about debuggability of JIT-compiled code.
false,
diff --git a/dex2oat/dex2oat.cc b/dex2oat/dex2oat.cc
index 10949e4..6a85d62 100644
--- a/dex2oat/dex2oat.cc
+++ b/dex2oat/dex2oat.cc
@@ -497,7 +497,6 @@
bool include_patch_information = CompilerOptions::kDefaultIncludePatchInformation;
bool include_debug_symbols = kIsDebugBuild;
bool watch_dog_enabled = true;
- bool generate_gdb_information = kIsDebugBuild;
bool abort_on_hard_verifier_error = false;
bool requested_specific_compiler = false;
@@ -541,12 +540,6 @@
watch_dog_enabled = true;
} else if (option == "--no-watch-dog") {
watch_dog_enabled = false;
- } else if (option == "--gen-gdb-info") {
- generate_gdb_information = true;
- // Debug symbols are needed for gdb information.
- include_debug_symbols = true;
- } else if (option == "--no-gen-gdb-info") {
- generate_gdb_information = false;
} else if (option.starts_with("-j")) {
const char* thread_count_str = option.substr(strlen("-j")).data();
if (!ParseUint(thread_count_str, &thread_count_)) {
@@ -684,7 +677,6 @@
include_debug_symbols = true;
} else if (option == "--no-include-debug-symbols" || option == "--strip-symbols") {
include_debug_symbols = false;
- generate_gdb_information = false; // Depends on debug symbols, see above.
} else if (option == "--debuggable") {
debuggable = true;
} else if (option.starts_with("--profile-file=")) {
@@ -936,7 +928,6 @@
small_method_threshold,
tiny_method_threshold,
num_dex_methods_threshold,
- generate_gdb_information,
include_patch_information,
top_k_profile_threshold,
debuggable,