commit f0a4206b652ff7465f81f2c49b246300920b2908
author Vladimir Marko <vmarko@google.com> Mon Oct 17 15:14:26 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon Oct 17 15:14:26 2016 +0000
tree f4118a46fa3a608e3bac9f5d285b552e78899162
parent 421c04f1d9e07449ce53dedaaaff3b03b5a959c3
parent 174d17b2f70f009d5fa349bb94b1703297c36ec4

Merge "Add DCHECK() for class loader in artResolveStringFromCode()."
am: 174d17b2f7

Change-Id: Ia4c9dcf9ebdd048e4d94bbaef38b494307badecf

runtime/runtime.cc

diff --git a/runtime/runtime.cc b/runtime/runtime.cc
index fdd8c4a..9c9fd3e 100644
--- a/runtime/runtime.cc
+++ b/runtime/runtime.cc
@@ -1406,11 +1406,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__)