commit 1561e1b4029cc25a653e17b36663ae047345fad0
author Christopher Ferris <cferris@google.com> Mon Apr 13 23:18:02 2015 +0000
committer Christopher Ferris <cferris@google.com> Mon Apr 13 16:22:01 2015 -0700
tree dfcb3db9060f9e05be6109616811bbe97f20b40c
parent 6c7bd25b2b2a07740bcd838c2f4024e67be83fd1

Revert "ART: Turn of native stack dump on x86 on-device"

This reverts commit 2f0751ea75e5f093d9ce7b8587e65a2ca3de0855.

Bug: 20040863

Change-Id: Ibd40916c0f84512b0ba13af09d4fd345be39e227

runtime/thread.cc

diff --git a/runtime/thread.cc b/runtime/thread.cc
index 58b272b..ac3f089 100644
--- a/runtime/thread.cc
+++ b/runtime/thread.cc
@@ -1070,12 +1070,7 @@
     // If we're currently in native code, dump that stack before dumping the managed stack.
     if (dump_for_abort || ShouldShowNativeStack(this)) {
       DumpKernelStack(os, GetTid(), "  kernel: ", false);
-      // b/20040863. Temporary workaround for x86 libunwind issue.
-#if defined(__i386__) && defined(HAVE_ANDROID_OS)
-      os << "Cannot dump native stack. b/20040863.\n";
-#else
       DumpNativeStack(os, GetTid(), "  native: ", GetCurrentMethod(nullptr, !dump_for_abort));
-#endif
     }
     DumpJavaStack(os);
   } else {