Merge "Track libcore Executable.getParameter() changes" am: c9568796e8 am: 71c69819cb
am: 204b3909ed
Change-Id: Ib2484de7f01fbfd32b28e36425073ef6da75bdd1
diff --git a/runtime/runtime.cc b/runtime/runtime.cc
index 97911d4..60ac758 100644
--- a/runtime/runtime.cc
+++ b/runtime/runtime.cc
@@ -1443,11 +1443,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);
diff --git a/runtime/utils.cc b/runtime/utils.cc
index d48edcf..6d9ee20 100644
--- a/runtime/utils.cc
+++ b/runtime/utils.cc
@@ -44,6 +44,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__)