ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

am 57c9b95b: am 39baa829: Merge "Get arm64 to compile."

Browse source 
* commit '57c9b95b1f62ceec18c56ac10fb137a96e7a2287':
  Get arm64 to compile.
This commit is contained in:
Christopher Ferris 2014-01-27 22:11:42 +00:00 • committed by Android Git Automerger
commit 4fe489665f
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libbacktrace/Android.mk
View file

@ -23,8 +23,7 @@ common_shared_libs := \
liblog \ liblog \
# To enable using libunwind on each arch, add it to this list. # To enable using libunwind on each arch, add it to this list.
libunwind_architectures := libunwind_architectures := arm64
#libunwind_architectures := arm
ifeq ($(TARGET_ARCH),$(filter $(TARGET_ARCH),$(libunwind_architectures))) ifeq ($(TARGET_ARCH),$(filter $(TARGET_ARCH),$(libunwind_architectures)))

2
libbacktrace/UnwindCurrent.cpp
View file

@ -43,7 +43,7 @@
#include <asm/sigcontext.h> #include <asm/sigcontext.h>
#include <asm/ucontext.h> #include <asm/ucontext.h>
typedef struct ucontext ucontext_t; typedef struct ucontext ucontext_t;
#elif !defined(__mips__) #elif !defined(__mips__) && !defined(__aarch64__)
#error Unsupported architecture. #error Unsupported architecture.
#endif #endif