commit 2d02d0c60ee1795444215d6c51f337f809539670
author Narayan Kamath <narayan@google.com> Fri Jun 23 08:45:24 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Jun 23 08:45:24 2017 +0000
tree e5726c04f373e408b0ae98936b52641a3d06c58a
parent c1aa4ca45d7df6273fdbe9af95cf82e90a93291f
parent 57a54c772ae52a45d91cc967b644b6b4d907105d

Merge "tombstoned: Improve message on java trace completion." am: 111f351762 am: 91492a56ca am: a153c7dd2a
am: f4682b2b52

Change-Id: Ic720f91a2e7b257fe55c12403a5b5c6bef171624

debuggerd/tombstoned/tombstoned.cpp

diff --git a/debuggerd/tombstoned/tombstoned.cpp b/debuggerd/tombstoned/tombstoned.cpp
index 4249e13..7685476 100644
--- a/debuggerd/tombstoned/tombstoned.cpp
+++ b/debuggerd/tombstoned/tombstoned.cpp
@@ -345,7 +345,14 @@
   }
 
   if (!crash->crash_path.empty()) {
-    LOG(ERROR) << "Tombstone written to: " << crash->crash_path;
+    if (crash->crash_type == kDebuggerdJavaBacktrace) {
+      LOG(ERROR) << "Traces for pid " << crash->crash_pid << " written to: " << crash->crash_path;
+    } else {
+      // NOTE: Several tools parse this log message to figure out where the
+      // tombstone associated with a given native crash was written. Any changes
+      // to this message must be carefully considered.
+      LOG(ERROR) << "Tombstone written to: " << crash->crash_path;
+    }
   }
 
 fail: