commit 84a4852bb2311d9deabd98a32e2ae6cdba9ac4fe
author Christopher Ferris <cferris@google.com> Sat Jan 20 18:25:16 2018 +0000
committer android-build-merger <android-build-merger@google.com> Sat Jan 20 18:25:16 2018 +0000
tree 29a74b561a808724fe2dd6f4c6c75474d0b374eb
parent b7834ed8482e9517078ade5b92cea7c7c8c519ec
parent 2bacf80b0279eb17f2ed843072bd1aab9898b5b7

Merge "Fix regression caused by libbacktrace API change."
am: 0ba2c9f4a2

Change-Id: I16e50d5d317cd43440338c1ad0da7aacaadc43a2

debuggerd/libdebuggerd/tombstone.cpp

diff --git a/debuggerd/libdebuggerd/tombstone.cpp b/debuggerd/libdebuggerd/tombstone.cpp
index 320e5db..7d85602 100644
--- a/debuggerd/libdebuggerd/tombstone.cpp
+++ b/debuggerd/libdebuggerd/tombstone.cpp
@@ -144,7 +144,7 @@
     } else {
       line += "     ";
     }
-    line += StringPrintf("%" PRIPTR "  %" PRIxPTR, *sp, stack_data[i]);
+    line += StringPrintf("%" PRIPTR "  %" PRIPTR, *sp, static_cast<uint64_t>(stack_data[i]));
 
     backtrace_map_t map;
     backtrace_map->FillIn(stack_data[i], &map);