commit b2775daebbbfb211dbc5fc6ee725292c4d79256e
author Christopher Ferris <cferris@google.com> Sat Jan 20 18:27:49 2018 +0000
committer android-build-merger <android-build-merger@google.com> Sat Jan 20 18:27:49 2018 +0000
tree f6bd928c1a3b81dbd6173502fed0e726e9678028
parent 7e15ce12bdb063d7a56cac7e8abf5967aa46b744
parent 84a4852bb2311d9deabd98a32e2ae6cdba9ac4fe

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

Change-Id: I99d2fcdfcfc1712d0281c86188b3e05082a76d18

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);