commit 9e417cdf3151194b911b267f4810aada5a0220d0
author David Sehr <sehr@google.com> Mon Oct 24 18:52:58 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon Oct 24 18:52:58 2016 +0000
tree bb66a7af9069a011ccc90bf402b280db82d3a663
parent 3df95ca8ec6660a4062c3f8c8238d46203f8815c
parent 460cca8e33a6e235fbfafe50bc2ef4042b4b43b7

Merge "Move dex CFG dumping out of utils.cc"
am: 460cca8e33

Change-Id: Ic76132136e4cc4140e6420b463f767f91a19f19f

runtime/runtime.cc

diff --git a/runtime/runtime.cc b/runtime/runtime.cc
index e8f41d4..0ae14ef 100644
--- a/runtime/runtime.cc
+++ b/runtime/runtime.cc
@@ -1422,11 +1422,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__)