diff options
| -rw-r--r-- | src/common/dwarf_cu_to_module.cc | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/common/dwarf_cu_to_module.cc b/src/common/dwarf_cu_to_module.cc index 6b4a3ad3..a8b0a29b 100644 --- a/src/common/dwarf_cu_to_module.cc +++ b/src/common/dwarf_cu_to_module.cc @@ -39,7 +39,9 @@ #include "common/dwarf_cu_to_module.h" #include <assert.h> +#if !defined(__ANDROID__) #include <cxxabi.h> +#endif #include <inttypes.h> #include <stdio.h> @@ -314,7 +316,10 @@ void DwarfCUToModule::GenericDIEHandler::ProcessAttributeString( name_attribute_ = AddStringToPool(data); break; case dwarf2reader::DW_AT_MIPS_linkage_name: { - char* demangled = abi::__cxa_demangle(data.c_str(), NULL, NULL, NULL); + char* demangled = NULL; +#if !defined(__ANDROID__) + demangled = abi::__cxa_demangle(data.c_str(), NULL, NULL, NULL); +#endif if (demangled) { demangled_name_ = AddStringToPool(demangled); free(reinterpret_cast<void*>(demangled)); @@ -784,9 +789,9 @@ void DwarfCUToModule::AssignLinesToFunctions() { // complexity from here on out is linear. // Put both our functions and lines in order by address. - sort(functions->begin(), functions->end(), - Module::Function::CompareByAddress); - sort(lines_.begin(), lines_.end(), Module::Line::CompareByAddress); + std::sort(functions->begin(), functions->end(), + Module::Function::CompareByAddress); + std::sort(lines_.begin(), lines_.end(), Module::Line::CompareByAddress); // The last line that we used any piece of. We use this only for // generating warnings. |