commit 56b004c350639763afb035dc44caec51384add6a
author Christopher Ferris <cferris@google.com> Fri Jun 02 22:19:15 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Jun 02 22:19:15 2017 +0000
tree b0289349371c92487c0b6d5853775884252e62fd
parent 27fc35ace41b532987611e399200ba07362b4b1c
parent 7f717dfc83a882bfb22f0e4f08c816133b17ed12

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

Change-Id: I1d67a1f2395962c5fda76394447a2deb47481259

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