commit 1c2b4d0f99e62386ef2d7065ebed8f7e5dc91f63
author Richard Uhler <ruhler@google.com> Thu Oct 20 11:58:39 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Oct 20 11:58:39 2016 +0000
tree 9e7bbc3dd81bcf83c2bae47054f5d2d6d1fd3dec
parent e2c470ceaaa32d5b75576de7438f416173a2cdb9
parent 3bbfcb794f5f81f4aa76ac0fb4c811d260e69d3b

Merge "Return error message if IndirectReferenceTable construction fails."
am: 3bbfcb794f

Change-Id: Ib7f88016ae51ce543542ada3dd0c578d0a463c22

runtime/runtime.cc

diff --git a/runtime/runtime.cc b/runtime/runtime.cc
index bde4185..b7c1cdd 100644
--- a/runtime/runtime.cc
+++ b/runtime/runtime.cc
@@ -1413,11 +1413,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 5557d5f..ced9884 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__)