Use public unwindstack function.
Test: Boot taimen device.
Test: Ran 137-cfi test.
Change-Id: Ic61356ba8da89fa5622bd3d40f4999f1497580ea
diff --git a/runtime/backtrace_helper.cc b/runtime/backtrace_helper.cc
index 0fa39cf..98280c7 100644
--- a/runtime/backtrace_helper.cc
+++ b/runtime/backtrace_helper.cc
@@ -21,8 +21,10 @@
#include <sys/types.h>
#include <unistd.h>
-#include "unwindstack/Unwinder.h"
+#include "unwindstack/Regs.h"
#include "unwindstack/RegsGetLocal.h"
+#include "unwindstack/Memory.h"
+#include "unwindstack/Unwinder.h"
#include "thread-inl.h"
@@ -35,7 +37,7 @@
namespace art {
-// We only really support libbacktrace on linux which is unfortunate but since this is only for
+// We only really support libunwindstack on linux which is unfortunate but since this is only for
// gcstress this isn't a huge deal.
#if defined(__linux__)
@@ -43,7 +45,7 @@
static constexpr const char* kTlsKey = "UnwindHelper::kTlsKey";
explicit UnwindHelper(size_t max_depth)
- : memory_(new unwindstack::MemoryLocal()),
+ : memory_(unwindstack::Memory::CreateProcessMemory(getpid())),
jit_(memory_),
dex_(memory_),
unwinder_(max_depth, &maps_, memory_) {