commit 0296d7f2c6210f8da34a90730f16927bc647a59e
author Andreas Gampe <agampe@google.com> Tue Oct 04 19:16:04 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Oct 04 19:16:04 2016 +0000
tree d8ff2499f702ffc8285e257bd8de1a0d87d95dd6
parent 9a3b34f8740d47fa8407e65adc50a20da7832448
parent e62b7dad8ad8dd3a246bf8326a1dbc19a9fb7f70

ART: Clean up IRT-related abort messaging am: f1e8630fe8 am: bd152e2a35
am: e62b7dad8a

Change-Id: Ib94f4fdd9966744217648f72e667bfb270695adc

runtime/runtime.cc

diff --git a/runtime/runtime.cc b/runtime/runtime.cc
index df0dca0..0d876c7 100644
--- a/runtime/runtime.cc
+++ b/runtime/runtime.cc
@@ -1403,11 +1403,6 @@
 }
 
 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);

runtime/utils.cc

diff --git a/runtime/utils.cc b/runtime/utils.cc
index a40e313..6f3402f 100644
--- a/runtime/utils.cc
+++ b/runtime/utils.cc
@@ -45,6 +45,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__)