diff options
| author | Jessica Wagantall <jwagantall@cyngn.com> | 2016-05-03 11:38:55 -0700 |
|---|---|---|
| committer | Jessica Wagantall <jwagantall@cyngn.com> | 2016-05-03 12:00:09 -0700 |
| commit | 82cef178019e0dc8a535e9ecb0357f17ae91ad76 (patch) | |
| tree | b257fbe1708ef0652bfe8df4dffdd9b327422ee8 | |
| parent | bbc34f83fcb8511c2f2eb575882b0670793342a8 (diff) | |
| parent | ad54cfed4516292654c997910839153264ae00a0 (diff) | |
| download | system_core-82cef178019e0dc8a535e9ecb0357f17ae91ad76.zip system_core-82cef178019e0dc8a535e9ecb0357f17ae91ad76.tar.gz system_core-82cef178019e0dc8a535e9ecb0357f17ae91ad76.tar.bz2 | |
Merge tag 'android-6.0.1_r43' into HEAD
Ticket: CYNGNOS-2373
Android 6.0.1 release 43 (MOB30J)
Change-Id: I917deb1f8604eea69f55243a9fb783eb2cd4062c
| -rw-r--r-- | libbacktrace/Backtrace.cpp | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/libbacktrace/Backtrace.cpp b/libbacktrace/Backtrace.cpp index 97f0ef4..42769ed 100644 --- a/libbacktrace/Backtrace.cpp +++ b/libbacktrace/Backtrace.cpp @@ -54,24 +54,8 @@ Backtrace::~Backtrace() { } } -extern "C" char* __cxa_demangle(const char* mangled, char* buf, size_t* len, - int* status); - std::string Backtrace::GetFunctionName(uintptr_t pc, uintptr_t* offset) { std::string func_name = GetFunctionNameRaw(pc, offset); - if (!func_name.empty()) { -#if defined(__APPLE__) - // Mac OS' __cxa_demangle demangles "f" as "float"; last tested on 10.7. - if (func_name[0] != '_') { - return func_name; - } -#endif - char* name = __cxa_demangle(func_name.c_str(), 0, 0, 0); - if (name) { - func_name = name; - free(name); - } - } return func_name; } |