Update for LocalUnwinder object removal.
Modify libfdtrack to use the normal Unwinder object. In addition,
update the libfdtrack so that it doesn't record frames in
libfdtrack.so rather than skipping frames it thinks will be in
the library.
Modify the malloc debug code to use the normal Unwinder object.
Bug: 120606663
Test: All unit tests pass.
Change-Id: I3c9612dd10e62389e6219e68045ee87f7b2625f5
diff --git a/libc/malloc_debug/PointerData.h b/libc/malloc_debug/PointerData.h
index 37d87db..92d2653 100644
--- a/libc/malloc_debug/PointerData.h
+++ b/libc/malloc_debug/PointerData.h
@@ -39,7 +39,7 @@
#include <vector>
#include <platform/bionic/macros.h>
-#include <unwindstack/LocalUnwinder.h>
+#include <unwindstack/Unwinder.h>
#include "OptionData.h"
#include "UnwindBacktrace.h"
@@ -109,7 +109,7 @@
size_t size;
bool zygote_child_alloc;
FrameInfoType* frame_info;
- std::vector<unwindstack::LocalFrameData>* backtrace_info;
+ std::vector<unwindstack::FrameData>* backtrace_info;
};
class PointerData : public OptionData {
@@ -181,7 +181,7 @@
static std::mutex frame_mutex_;
static std::unordered_map<FrameKeyType, size_t> key_to_index_;
static std::unordered_map<size_t, FrameInfoType> frames_;
- static std::unordered_map<size_t, std::vector<unwindstack::LocalFrameData>> backtraces_info_;
+ static std::unordered_map<size_t, std::vector<unwindstack::FrameData>> backtraces_info_;
static size_t cur_hash_index_;
static std::mutex free_pointer_mutex_;