Revert "HACK: Disable native stack trace dumping for tetra. DO NOT MERGE"

This reverts commit 471b7cb6c1b8128bb343b49198f2654f9f5b8f86.

Change-Id: Ia22615b401fd28ea94e6269f9eac5653e103a6fd

diff --git a/runtime/Android.mk b/runtime/Android.mk
index 4a57acd..84f2248 100644 (file)
--- a/runtime/Android.mk
+++ b/runtime/Android.mk
@@ -331,10 +331,6 @@ ifeq ($(ART_USE_HSPACE_COMPACT),true)
   LIBART_CFLAGS += -DART_USE_HSPACE_COMPACT
 endif
 
-ifneq ($(filter tetra, $(TARGET_DEVICE)),)
-  LIBART_CFLAGS += -DNO_DUMP_NATIVE_STACKS
-endif
-
 # $(1): target or host
 # $(2): ndebug or debug
 define build-libart

diff --git a/runtime/thread.cc b/runtime/thread.cc
index d238b01..2f474f7 100644 (file)
--- a/runtime/thread.cc
+++ b/runtime/thread.cc
@@ -1036,10 +1036,8 @@ void Thread::DumpStack(std::ostream& os) const {
   if (safe_to_dump) {
     // If we're currently in native code, dump that stack before dumping the managed stack.
     if (dump_for_abort || ShouldShowNativeStack(this)) {
-#ifndef NO_DUMP_NATIVE_STACKS
       DumpKernelStack(os, GetTid(), "  kernel: ", false);
       DumpNativeStack(os, GetTid(), "  native: ", GetCurrentMethod(nullptr, !dump_for_abort));
-#endif
     }
     DumpJavaStack(os);
   } else {