diff options
Diffstat (limited to 'runtime/runtime.cc')
| -rw-r--r-- | runtime/runtime.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/runtime/runtime.cc b/runtime/runtime.cc index c46bd8d2b9..968f02a359 100644 --- a/runtime/runtime.cc +++ b/runtime/runtime.cc @@ -834,7 +834,7 @@ void Runtime::InitNonZygoteOrPostFork( void Runtime::StartSignalCatcher() { if (!is_zygote_) { - signal_catcher_ = new SignalCatcher(stack_trace_dir_, stack_trace_file_); + signal_catcher_ = new SignalCatcher(stack_trace_file_, use_tombstoned_traces_); } } @@ -1069,7 +1069,11 @@ bool Runtime::Init(RuntimeArgumentMap&& runtime_options_in) { abort_ = runtime_options.GetOrDefault(Opt::HookAbort); default_stack_size_ = runtime_options.GetOrDefault(Opt::StackSize); - stack_trace_dir_ = runtime_options.ReleaseOrDefault(Opt::StackTraceDir); + use_tombstoned_traces_ = runtime_options.GetOrDefault(Opt::UseTombstonedTraces); +#if !defined(ART_TARGET_ANDROID) + CHECK(!use_tombstoned_traces_) + << "-Xusetombstonedtraces is only supported in an Android environment"; +#endif stack_trace_file_ = runtime_options.ReleaseOrDefault(Opt::StackTraceFile); compiler_executable_ = runtime_options.ReleaseOrDefault(Opt::Compiler); |