Make it possible to build strace for x86-64.
Change-Id: I0221cd4a9c38e99ab5939d308b24216100e50dab
diff --git a/Android.mk b/Android.mk
index 7682998..11601a8 100644
--- a/Android.mk
+++ b/Android.mk
@@ -82,7 +82,6 @@
-DHAVE_SIGACTION=1 \
-DHAVE_SIGINFO_T=1 \
-DHAVE_SIG_ATOMIC_T=1 \
- -DHAVE_STAT64=1 \
-DHAVE_STATFS64=1 \
-DHAVE_STDBOOL_H=1 \
-DHAVE_STDINT_H=1 \
@@ -102,6 +101,7 @@
-DHAVE_SYS_IOCTL_H=1 \
-DHAVE_SYS_POLL_H=1 \
-DHAVE_SYS_PTRACE_H=1 \
+ -DHAVE_SYS_REG_H=1 \
-DHAVE_SYS_SIGLIST=1 \
-DHAVE_SYS_STAT_H=1 \
-DHAVE_SYS_TYPES_H=1 \
@@ -138,19 +138,25 @@
arch := $(TARGET_ARCH)
ifeq ($(TARGET_ARCH),arm)
- LOCAL_CFLAGS += -DARM=1
- LOCAL_CFLAGS += -DHAVE_STRUCT___OLD_KERNEL_STAT=1
+ LOCAL_CFLAGS += -DARM=1
+ LOCAL_CFLAGS += -DHAVE_STAT64=1
+ LOCAL_CFLAGS += -DHAVE_STRUCT___OLD_KERNEL_STAT=1
else ifeq ($(TARGET_ARCH),mips)
- LOCAL_CFLAGS += -DMIPS=1
- LOCAL_CFLAGS += -DHAVE_ASM_SYSMIPS_H=1
-# Mips does not use STRUCT__OLD_KERNEL_STAT type
+ LOCAL_CFLAGS += -DMIPS=1
+ LOCAL_CFLAGS += -DHAVE_STAT64=1
+ LOCAL_CFLAGS += -DHAVE_ASM_SYSMIPS_H=1
+ # mips does not use STRUCT__OLD_KERNEL_STAT type
else ifeq ($(TARGET_ARCH),x86)
- LOCAL_CFLAGS += -DI386=1
- LOCAL_CFLAGS += -DHAVE_STRUCT___OLD_KERNEL_STAT=1
- arch := i386
+ LOCAL_CFLAGS += -DI386=1
+ LOCAL_CFLAGS += -DHAVE_STAT64=1
+ LOCAL_CFLAGS += -DHAVE_STRUCT___OLD_KERNEL_STAT=1
+ arch := i386
+else ifeq ($(TARGET_ARCH),x86_64)
+ LOCAL_CFLAGS += -DX86_64=1
endif
LOCAL_CFLAGS += \
+ -Wall \
-Wno-missing-field-initializers \
-Wno-unused-parameter \
-Wno-sign-compare \