diff --git a/libbacktrace/Android.mk b/libbacktrace/Android.mk index 9c52ad742..f23eefdd7 100644 --- a/libbacktrace/Android.mk +++ b/libbacktrace/Android.mk @@ -23,8 +23,7 @@ common_shared_libs := \ liblog \ # To enable using libunwind on each arch, add it to this list. -libunwind_architectures := -#libunwind_architectures := arm +libunwind_architectures := arm64 ifeq ($(TARGET_ARCH),$(filter $(TARGET_ARCH),$(libunwind_architectures))) diff --git a/libbacktrace/UnwindCurrent.cpp b/libbacktrace/UnwindCurrent.cpp index 747eb21b6..d1195ee5f 100644 --- a/libbacktrace/UnwindCurrent.cpp +++ b/libbacktrace/UnwindCurrent.cpp @@ -43,7 +43,7 @@ #include #include typedef struct ucontext ucontext_t; -#elif !defined(__mips__) +#elif !defined(__mips__) && !defined(__aarch64__) #error Unsupported architecture. #endif