Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 57c9b95b authored by Christopher Ferris's avatar Christopher Ferris Committed by Android Git Automerger
Browse files

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

* commit '39baa829':
  Get arm64 to compile.
parents 3d55662f 39baa829

libbacktrace/Android.mk

+1 −2
Original line number Diff line number Diff line
@@ -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)))

libbacktrace/UnwindCurrent.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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