Re-enable libunwind for arm.
Update to handle the new optimized way that libunwind works.
In addition, a small refactor of the BacktraceMap code.
A few new tests of for good measure.
Change-Id: I2f9b4f5ad5a0dfe907b31febee76e4b9b94fb76f
diff --git a/libbacktrace/Android.mk b/libbacktrace/Android.mk
index f23eefd..0ae8839 100644
--- a/libbacktrace/Android.mk
+++ b/libbacktrace/Android.mk
@@ -1,7 +1,7 @@
LOCAL_PATH:= $(call my-dir)
common_src := \
- Backtrace.cpp \
+ BacktraceImpl.cpp \
BacktraceMap.cpp \
BacktraceThread.cpp \
thread_utils.c \
@@ -23,7 +23,7 @@
liblog \
# To enable using libunwind on each arch, add it to this list.
-libunwind_architectures := arm64
+libunwind_architectures := arm arm64
ifeq ($(TARGET_ARCH),$(filter $(TARGET_ARCH),$(libunwind_architectures)))
@@ -35,6 +35,7 @@
LOCAL_SRC_FILES:= \
$(common_src) \
UnwindCurrent.cpp \
+ UnwindMap.cpp \
UnwindPtrace.cpp \
LOCAL_CFLAGS := \