diff options
| author | Christopher Ferris <cferris@google.com> | 2015-04-14 00:18:12 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-04-14 00:18:14 +0000 |
| commit | e015a31e509c3f4de8a90b57b77329ba6609ce2f (patch) | |
| tree | 3b4ce3591c8fe00b3fe232847ad5af0042afd064 | |
| parent | 5b310c4bc77609d8247356005430ae05714e9585 (diff) | |
| parent | 1561e1b4029cc25a653e17b36663ae047345fad0 (diff) | |
| download | art-e015a31e509c3f4de8a90b57b77329ba6609ce2f.zip art-e015a31e509c3f4de8a90b57b77329ba6609ce2f.tar.gz art-e015a31e509c3f4de8a90b57b77329ba6609ce2f.tar.bz2 | |
Merge "Revert "ART: Turn of native stack dump on x86 on-device""
| -rw-r--r-- | runtime/thread.cc | 5 |
1 files changed, 0 insertions, 5 deletions
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 @@ void Thread::DumpStack(std::ostream& os) const { // 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 { |