Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e67232e1 authored by Christopher Ferris's avatar Christopher Ferris Committed by android-build-merger
Browse files

Merge "Use demangle for function names." am: daa6602a am: 7f717dfc am: 56b004c3 

am: b5d73cff

Change-Id: Ifdc5cdc6eb2e5adb49f7c0c1f2d15c34f9e6517d
parents 2d707e09 b5d73cff

libbacktrace/Android.bp

+1 −0
Original line number Original line Diff line number Diff line
@@ -113,6 +113,7 @@ cc_library { 
            static_libs: ["libasync_safe", "libcutils"],

            static_libs: ["libasync_safe", "libcutils"],

        },

        },

    },

    },

    whole_static_libs: ["libdemangle"],

}

}





cc_library_shared {

cc_library_shared {

libbacktrace/Backtrace.cpp

+3 −2
Original line number Original line Diff line number Diff line
@@ -27,6 +27,8 @@ 
#include <backtrace/Backtrace.h>

#include <backtrace/Backtrace.h>

#include <backtrace/BacktraceMap.h>

#include <backtrace/BacktraceMap.h>





#include <demangle.h>



#include "BacktraceLog.h"

#include "BacktraceLog.h"

#include "thread_utils.h"

#include "thread_utils.h"

#include "UnwindCurrent.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)) {

  if (map->start == 0 || (map->flags & PROT_DEVICE_MAP)) {

    return "";

    return "";

  }

  }

  std::string func_name = GetFunctionNameRaw(pc, offset);

  return demangle(GetFunctionNameRaw(pc, offset).c_str());

  return func_name;

}

}





bool Backtrace::VerifyReadWordArgs(uintptr_t ptr, word_t* out_value) {

bool Backtrace::VerifyReadWordArgs(uintptr_t ptr, word_t* out_value) {