commit 00acd1d2a18bbe473bdfd92488525db44381ff05
author Christopher Ferris <cferris@google.com> Fri Jun 02 22:16:45 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Jun 02 22:16:45 2017 +0000
tree 973448742b9520fc3e22dc736d53d60d2b88e1b0
parent 742ad3c8a35026824209012ef45858f28e7768c0
parent 263ff6261599f999fe976893c5ad6d8b4f3bc41a

Merge "Use demangle for function names."
am: daa6602a86

Change-Id: I045673de2c9ac70cdbe65ef56e0ee7b057d88e93

libbacktrace/Android.bp

diff --git a/libbacktrace/Android.bp b/libbacktrace/Android.bp
index 7dd9227..a643a29 100644
--- a/libbacktrace/Android.bp
+++ b/libbacktrace/Android.bp
@@ -113,6 +113,7 @@
             static_libs: ["libasync_safe", "libcutils"],
         },
     },
+    whole_static_libs: ["libdemangle"],
 }
 
 cc_library_shared {

libbacktrace/Backtrace.cpp

diff --git a/libbacktrace/Backtrace.cpp b/libbacktrace/Backtrace.cpp
index 3545661..e46d353 100644
--- a/libbacktrace/Backtrace.cpp
+++ b/libbacktrace/Backtrace.cpp
@@ -27,6 +27,8 @@
 #include <backtrace/Backtrace.h>
 #include <backtrace/BacktraceMap.h>
 
+#include <demangle.h>
+
 #include "BacktraceLog.h"
 #include "thread_utils.h"
 #include "UnwindCurrent.h"
@@ -62,8 +64,7 @@
   if (map->start == 0 || (map->flags & PROT_DEVICE_MAP)) {
     return "";
   }
-  std::string func_name = GetFunctionNameRaw(pc, offset);
-  return func_name;
+  return demangle(GetFunctionNameRaw(pc, offset).c_str());
 }
 
 bool Backtrace::VerifyReadWordArgs(uintptr_t ptr, word_t* out_value) {