commit b73ab5d7c0d1110492ea4301eea2b0534d5679ac
author Leonard Mosescu <mosescu@google.com> Tue Oct 25 19:53:49 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Oct 25 19:53:49 2016 +0000
tree 7b33284174ba8a95f8a71cc0736c5d679b6dbccd
parent 3c7c825f829df8bb167fd7f259ebb8aebe654606
parent f35843dc6a83b50bf09c540e2c49b2953367fe3c

Merge "Enable agent attaching during live phase"
am: f35843dc6a

Change-Id: Ic8c6e3d5c1b3695187767bf31d2839e3395b9740

runtime/runtime.cc

diff --git a/runtime/runtime.cc b/runtime/runtime.cc
index 4e600ae..346856b 100644
--- a/runtime/runtime.cc
+++ b/runtime/runtime.cc
@@ -1444,11 +1444,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__)