Fix Android x86_64 support
libunwind imports have to be re-ordered to pick the correct
"_Ux86_64_setcontext" definition. Small typo fixes too.
Signed-off-by: Anestis Bechtsoudis <anestis@census-labs.com>
diff --git a/android/Android.mk b/android/Android.mk
index 0471bd6..d34c570 100644
--- a/android/Android.mk
+++ b/android/Android.mk
@@ -31,7 +31,6 @@
else ifeq ($(APP_ABI),$(filter $(APP_ABI),x86_64))
ARCH_ABI := x86_64
UNW_ARCH := x86_64
- $(error $(APP_ABI) Android not supported with ptrace API (issues with libunwind))
else
$(error Unsuported / Unknown APP_API '$(APP_ABI)')
endif
@@ -92,7 +91,7 @@
ifeq ($(ANDROID_WITH_PTRACE),true)
LOCAL_C_INCLUDES := third_party/android/libunwind/include third_party/android/capstone/include
- LOCAL_STATIC_LIBRARIES := libunwind libunwind-arch libunwind-ptrace libunwind-dwarf-generic libcapstone
+ LOCAL_STATIC_LIBRARIES := libunwind-arch libunwind libunwind-ptrace libunwind-dwarf-generic libcapstone
LOCAL_CFLAGS += -D__HF_USE_CAPSTONE__
ARCH_SRCS := linux/arch.c linux/ptrace_utils.c linux/perf.c linux/unwind.c
ARCH := LINUX