diff options
| author | Christopher Ferris <cferris@google.com> | 2014-01-27 10:50:58 -0800 |
|---|---|---|
| committer | Christopher Ferris <cferris@google.com> | 2014-01-27 10:52:08 -0800 |
| commit | edbe3b4b56a02e1c56f95a8ab05afb4135339cc8 (patch) | |
| tree | e6d5f4cf38423ac5ef1af84598614b73500c5573 | |
| parent | fb6d601f5ae99a59a16f87950a15b9ed3d175db7 (diff) | |
| download | system_core-edbe3b4b56a02e1c56f95a8ab05afb4135339cc8.zip system_core-edbe3b4b56a02e1c56f95a8ab05afb4135339cc8.tar.gz system_core-edbe3b4b56a02e1c56f95a8ab05afb4135339cc8.tar.bz2 | |
Get arm64 to compile.
Change-Id: Ica021aa134388fe7069a5de5df8036ecf0d570f8
| -rw-r--r-- | libbacktrace/Android.mk | 3 | ||||
| -rw-r--r-- | libbacktrace/UnwindCurrent.cpp | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/libbacktrace/Android.mk b/libbacktrace/Android.mk index 9c52ad7..f23eefd 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 747eb21..d1195ee 100644 --- a/libbacktrace/UnwindCurrent.cpp +++ b/libbacktrace/UnwindCurrent.cpp @@ -43,7 +43,7 @@ #include <asm/sigcontext.h> #include <asm/ucontext.h> typedef struct ucontext ucontext_t; -#elif !defined(__mips__) +#elif !defined(__mips__) && !defined(__aarch64__) #error Unsupported architecture. #endif |