commit 31cbfaa3ef6d2e7393067bf5e9554ae45f0836b0
author Josh Gao <jmgao@google.com> Sat Dec 23 00:29:00 2017 +0000
committer android-build-merger <android-build-merger@google.com> Sat Dec 23 00:29:00 2017 +0000
tree f104336fc3924ca5b5fa7266001732e5abfa9f2c
parent dbc57249b3b0b96423b7bb1cd6aced325596ada4
parent 44bb08a6931ab58a91ba9895fd38bf635b2d6b18

Merge "debuggerd: restore the location of abort message." am: 2da01a2a71 am: 31b8659606
am: ad90832fd6

Change-Id: I622886b282ee501f4a532cbded1035ab90ab3e6f

debuggerd/libdebuggerd/tombstone.cpp

diff --git a/debuggerd/libdebuggerd/tombstone.cpp b/debuggerd/libdebuggerd/tombstone.cpp
index 624637a..89a125b 100644
--- a/debuggerd/libdebuggerd/tombstone.cpp
+++ b/debuggerd/libdebuggerd/tombstone.cpp
@@ -402,6 +402,10 @@
     dump_signal_info(log, thread_info.siginfo);
   }
 
+  if (primary_thread) {
+    dump_abort_message(log, process_memory, abort_msg_address);
+  }
+
   dump_registers(log, thread_info.registers.get());
 
   std::vector<backtrace_frame_data_t> frames;
@@ -419,10 +423,6 @@
   }
 
   if (primary_thread) {
-    dump_abort_message(log, process_memory, abort_msg_address);
-  }
-
-  if (primary_thread) {
     dump_memory_and_code(log, process_memory, thread_info.registers.get());
     if (map) {
       uintptr_t addr = 0;