commit 2af9c7dcee8d1f15b3f6a1caea05f47c5af4d8d3
author Hiroshi Yamauchi <yamauchi@google.com> Wed Nov 16 22:51:32 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Nov 16 22:51:32 2016 +0000
tree 6df14bb22c3aa76dbc1ecb9e80fb540738fde260
parent efbcf48d7ca0c7ae4fdc106cb319ff54081dc89e
parent 96de579b8cb24e87ad0a0ec33b0507c95765a951

Merge "Ensure CC GC is used for the read barrier config."
am: 96de579b8c

Change-Id: I36400acaa712fc52b4bdd62370b5a1b09d8aef0d

runtime/runtime.cc

diff --git a/runtime/runtime.cc b/runtime/runtime.cc
index 09a0462..eb2df3d 100644
--- a/runtime/runtime.cc
+++ b/runtime/runtime.cc
@@ -1457,11 +1457,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__)