commit 3f06a4ddecd15e3039ecedeea16c2d55207bc26e
author Nicolas Geoffray <ngeoffray@google.com> Wed Nov 09 10:00:08 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Nov 09 10:00:08 2016 +0000
tree 7eb0974f4571c36e3e00e169d6f67c8a29796fa3
parent 0f9c5a7030ebc194bfd6d722260c8fcc1f9a3dfb
parent 0864c98b10cb8ca306671cabaa9be2a4068a2711

Merge "JIT root tables."
am: 0864c98b10

Change-Id: Ic8d73f221f6d0a9b308dacb3288cccbf807d7886

runtime/runtime.cc

diff --git a/runtime/runtime.cc b/runtime/runtime.cc
index d90e896..ae98394 100644
--- a/runtime/runtime.cc
+++ b/runtime/runtime.cc
@@ -1458,11 +1458,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__)