diff options
| -rw-r--r-- | compiler/driver/compiler_options.cc | 2 | ||||
| -rw-r--r-- | compiler/driver/compiler_options.h | 2 | ||||
| -rw-r--r-- | dex2oat/dex2oat.cc | 7 | ||||
| -rwxr-xr-x | test/137-cfi/run | 2 |
4 files changed, 5 insertions, 8 deletions
diff --git a/compiler/driver/compiler_options.cc b/compiler/driver/compiler_options.cc index 209bb5a3c2..385f34a9f9 100644 --- a/compiler/driver/compiler_options.cc +++ b/compiler/driver/compiler_options.cc @@ -211,11 +211,9 @@ bool CompilerOptions::ParseCompilerOption(const StringPiece& option, UsageFn Usa generate_debug_info_ = false; } else if (option == "--debuggable") { debuggable_ = true; - generate_debug_info_ = true; } else if (option == "--native-debuggable") { native_debuggable_ = true; debuggable_ = true; - generate_debug_info_ = true; } else if (option.starts_with("--top-k-profile-threshold=")) { ParseDouble(option.data(), '=', 0.0, 100.0, &top_k_profile_threshold_, Usage); } else if (option == "--include-patch-information") { diff --git a/compiler/driver/compiler_options.h b/compiler/driver/compiler_options.h index f8032bb514..f14bdc4a2f 100644 --- a/compiler/driver/compiler_options.h +++ b/compiler/driver/compiler_options.h @@ -50,7 +50,7 @@ class CompilerOptions FINAL { static const size_t kDefaultNumDexMethodsThreshold = 900; static constexpr double kDefaultTopKProfileThreshold = 90.0; static const bool kDefaultNativeDebuggable = false; - static const bool kDefaultGenerateDebugInfo = kIsDebugBuild; + static const bool kDefaultGenerateDebugInfo = false; static const bool kDefaultIncludePatchInformation = false; static const size_t kDefaultInlineDepthLimit = 3; static const size_t kDefaultInlineMaxCodeUnits = 32; diff --git a/dex2oat/dex2oat.cc b/dex2oat/dex2oat.cc index 32a237a126..808643a6a6 100644 --- a/dex2oat/dex2oat.cc +++ b/dex2oat/dex2oat.cc @@ -313,13 +313,12 @@ NO_RETURN static void Usage(const char* fmt, ...) { UsageError(" -g"); UsageError(" --generate-debug-info: Generate debug information for native debugging,"); UsageError(" such as stack unwinding information, ELF symbols and DWARF sections."); - UsageError(" This generates all the available information. Unneeded parts can be"); - UsageError(" stripped using standard command line tools such as strip or objcopy."); - UsageError(" (enabled by default in debug builds, disabled by default otherwise)"); + UsageError(" If used without --native-debuggable, it will be best-effort only."); + UsageError(" This option does not affect the generated code. (disabled by default)"); UsageError(""); UsageError(" --no-generate-debug-info: Do not generate debug information for native debugging."); UsageError(""); - UsageError(" --debuggable: Produce code debuggable with Java debugger. Implies -g."); + UsageError(" --debuggable: Produce code debuggable with Java debugger."); UsageError(""); UsageError(" --native-debuggable: Produce code debuggable with native debugger (like LLDB)."); UsageError(" Implies --debuggable."); diff --git a/test/137-cfi/run b/test/137-cfi/run index ecbbbc7c48..9c567b6813 100755 --- a/test/137-cfi/run +++ b/test/137-cfi/run @@ -14,4 +14,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -exec ${RUN} "$@" +exec ${RUN} "$@" -Xcompiler-option --generate-debug-info |