commit d6b039cc23d8da969290924a9379cbe10633c292
author Colin Cross <ccross@android.com> Wed Jan 29 18:09:48 2014 -0800
committer Colin Cross <ccross@android.com> Wed Jan 29 18:49:24 2014 -0800
tree 96a5943e410acdd6dae62246fd8746b7b313211c
parent 0309c906303a5e195f1c460f99a49210d0998673

external/strace: rewrite make rules for multilib

Rewrite the make rules to use variables like LOCAL_*_arch and
LOCAL_*_32 to support a multilib build.

Change-Id: I75cea40f0118bd9bcb2b12a11829779a7060068b

Android.mk

diff --git a/Android.mk b/Android.mk
index 8c89def..037fd89 100644
--- a/Android.mk
+++ b/Android.mk
@@ -109,33 +109,21 @@
 # uapi's asm/sigcontext.h doesn't have sigcontext_struct.
 LOCAL_CFLAGS += -Dsigcontext_struct=sigcontext
 
-ifeq ($(TARGET_IS_64_BIT),true)
-    LOCAL_CFLAGS += -DSIZEOF_LONG=8 -DSIZEOF_RLIM_T=8
-else
-    LOCAL_CFLAGS += -DSIZEOF_LONG=4 -DSIZEOF_RLIM_T=4
-endif
+LOCAL_CFLAGS_64 += -DSIZEOF_LONG=8 -DSIZEOF_RLIM_T=8
+LOCAL_CFLAGS_32 += -DSIZEOF_LONG=4 -DSIZEOF_RLIM_T=4 -DHAVE_STAT64=1
 
-arch := $(TARGET_ARCH)
-ifeq ($(TARGET_ARCH),arm)
-    LOCAL_CFLAGS += -DARM=1
-    LOCAL_CFLAGS += -DHAVE_STAT64=1
-    LOCAL_CFLAGS += -DHAVE_STRUCT___OLD_KERNEL_STAT=1
-else ifeq ($(TARGET_ARCH),arm64)
-    LOCAL_CFLAGS += -DAARCH64=1
-    arch := aarch64
-else ifeq ($(TARGET_ARCH),mips)
-    LOCAL_CFLAGS += -DMIPS=1
-    LOCAL_CFLAGS += -DHAVE_STAT64=1
-    LOCAL_CFLAGS += -DHAVE_ASM_SYSMIPS_H=1
-    LOCAL_CFLAGS += -UHAVE_STRUCT___OLD_KERNEL_STAT
-else ifeq ($(TARGET_ARCH),x86)
-    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_arm += -DARM=1
+LOCAL_CFLAGS_arm += -DHAVE_STRUCT___OLD_KERNEL_STAT=1
+
+LOCAL_CFLAGS_arm64 += -DAARCH64=1
+
+LOCAL_CFLAGS_mips += -DMIPS=1
+LOCAL_CFLAGS_mips += -DHAVE_ASM_SYSMIPS_H=1
+
+LOCAL_CFLAGS_x86 += -DI386=1
+LOCAL_CFLAGS_x86 += -DHAVE_STRUCT___OLD_KERNEL_STAT=1
+
+LOCAL_CFLAGS_x86_64 += -DX86_64=1
 
 LOCAL_CFLAGS += \
     -Wall \
@@ -144,9 +132,14 @@
     -Wno-sign-compare \
 
 LOCAL_C_INCLUDES := \
-    $(LOCAL_PATH)/linux/$(arch) \
     $(LOCAL_PATH)/linux
 
+LOCAL_C_INCLUDES_arm := $(LOCAL_PATH)/linux/arm
+LOCAL_C_INCLUDES_arm64 := $(LOCAL_PATH)/linux/aarch64
+LOCAL_C_INCLUDES_mips := $(LOCAL_PATH)/linux/mips
+LOCAL_C_INCLUDES_x86 := $(LOCAL_PATH)/linux/i386
+LOCAL_C_INCLUDES_x86_64 := $(LOCAL_PATH)/linux/x86_64
+
 LOCAL_MODULE := strace
 
 LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)