ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
am: b5d73cffef

Change-Id: Ifdc5cdc6eb2e5adb49f7c0c1f2d15c34f9e6517d
This commit is contained in:
Christopher Ferris 2017-06-02 22:26:28 +00:00 • committed by android-build-merger
commit e67232e13e
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
libbacktrace/Android.bp
View file

@ -113,6 +113,7 @@ cc_library {
static_libs: ["libasync_safe", "libcutils"],
},
},
whole_static_libs: ["libdemangle"],
}
cc_library_shared {

5
libbacktrace/Backtrace.cpp
View file

@ -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 @@ std::string Backtrace::GetFunctionName(uintptr_t pc, uintptr_t* offset, const ba
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) {