commit 40d98eb1189ed7ab6070a8d3272fcb60b7bf7187
author Andreas Gampe <agampe@google.com> Fri Nov 18 21:09:46 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Nov 18 21:09:46 2016 +0000
tree a3989d8c448e654fcf1f7e7345e5717f6e939922
parent 5da6d670959ccadaadc9c377fe986c4eacf2cded
parent 88c4ff69dfed9e8f057a7b854605fc266cb35a5f

Merge "ART: Dump native stack on recursive abort"
am: 88c4ff69df

Change-Id: Id4ee3b6dadb4de689858d388ca8171f326dac651

runtime/runtime.cc

diff --git a/runtime/runtime.cc b/runtime/runtime.cc
index 771ac27..20f202c 100644
--- a/runtime/runtime.cc
+++ b/runtime/runtime.cc
@@ -1474,11 +1474,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 6ed54f7..66739a9 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__)