diff options
| author | 2016-12-06 14:30:01 -0800 | |
|---|---|---|
| committer | 2016-12-06 14:30:01 -0800 | |
| commit | 0dd27eb2b51d030866c25dbf8e7bb737eb35a888 (patch) | |
| tree | 15b542ac079f30043cd3654cf5d3c40ae3ea34d0 | |
| parent | 1a5bfdc22bc3d659cf8ea7077151972725ef093c (diff) | |
| parent | 6ce90a2d55ff64a049baf9685d078cef83568591 (diff) | |
Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
| -rw-r--r-- | runtime/runtime.cc | 5 | ||||
| -rw-r--r-- | runtime/utils.cc | 1 |
2 files changed, 1 insertions, 5 deletions
diff --git a/runtime/runtime.cc b/runtime/runtime.cc index 66bb80315d..bf345486ed 100644 --- a/runtime/runtime.cc +++ b/runtime/runtime.cc @@ -1493,11 +1493,6 @@ void Runtime::RegisterRuntimeNativeMethods(JNIEnv* env) { } void Runtime::DumpForSigQuit(std::ostream& os) { - // Dumping for SIGQIT may cause deadlocks if the the debugger is active. b/26118154 - if (Dbg::IsDebuggerActive()) { - LOG(INFO) << "Skipping DumpForSigQuit due to active debugger"; - return; - } GetClassLinker()->DumpForSigQuit(os); GetInternTable()->DumpForSigQuit(os); GetJavaVM()->DumpForSigQuit(os); diff --git a/runtime/utils.cc b/runtime/utils.cc index 6ed54f748f..66739a9d2e 100644 --- a/runtime/utils.cc +++ b/runtime/utils.cc @@ -37,6 +37,7 @@ #if defined(__APPLE__) #include "AvailabilityMacros.h" // For MAC_OS_X_VERSION_MAX_ALLOWED #include <sys/syscall.h> +#include <crt_externs.h> #endif #if defined(__linux__) |