commit 1112203a69f86db7ef0025ed71293d199e8f9324
author David Sehr <sehr@google.com> Mon Oct 17 22:56:56 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon Oct 17 22:56:56 2016 +0000
tree edd2555001ca8c445b0b5a7f0545f8277849fbdd
parent 5a88e28f91b4896144aab79d045e204f60638039
parent 27b88f3a2aaaa2dd3e03706d02590a07a96d8c30

Merge "Remove logging dependency on runtime"
am: 27b88f3a2a

Change-Id: Ica477f15e9ee950f4cdf026272e52c0d3749825d

runtime/runtime.cc

diff --git a/runtime/runtime.cc b/runtime/runtime.cc
index 6e15c38..d3bba24 100644
--- a/runtime/runtime.cc
+++ b/runtime/runtime.cc
@@ -1410,11 +1410,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 a40e313..6f3402f 100644
--- a/runtime/utils.cc
+++ b/runtime/utils.cc
@@ -45,6 +45,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__)