commit 7fbbb47054906ea0fefa0538c69797a9a5b8ceb0
author Neil Fuller <nfuller@google.com> Tue Sep 13 09:13:14 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Sep 13 09:13:14 2016 +0000
tree 5a9b45b4f8c3ad94bb08ee8710a1d44ab0224e0c
parent e8a60b9c7d4695ff7f94528ef341bfffd77e2a6a
parent 204b3909ed70cca363b1bc48c500da16c2fc7b5a

Merge "Track libcore Executable.getParameter() changes" am: c9568796e8 am: 71c69819cb
am: 204b3909ed

Change-Id: Ib2484de7f01fbfd32b28e36425073ef6da75bdd1

runtime/runtime.cc

diff --git a/runtime/runtime.cc b/runtime/runtime.cc
index 97911d4..60ac758 100644
--- a/runtime/runtime.cc
+++ b/runtime/runtime.cc
@@ -1443,11 +1443,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 d48edcf..6d9ee20 100644
--- a/runtime/utils.cc
+++ b/runtime/utils.cc
@@ -44,6 +44,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__)