Remove assumption about use of ARM compiler.
Pete Delaney [Thu, 25 Jul 2013 08:34:02 +0000 (01:34 -0700)]
Change-Id: I3ecd1878b65c2f328adf7e04c3ad9756ccf5ed0f
Signed-off-by: Pete Delaney <piet.delaney@imgtec.com>

bcmdhd/bcmdhd_net_iface/Android.mk
bcmdhd/dhdutil/Android.mk
bcmdhd/wpa_supplicant_8_lib/Android.mk

index be22624..c5dc34d 100644 (file)
@@ -24,7 +24,9 @@ LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 LOCAL_SRC_FILES := bcmdhd_net_iface.c
 LOCAL_MODULE := libnetcmdiface
+ifeq ($(TARGET_ARCH),arm)
 LOCAL_CFLAGS := -mabi=aapcs-linux
+endif
 LOCAL_MODULE_TAGS := optional
 LOCAL_ALLOW_UNDEFINED_SYMBOLS := true
 include $(BUILD_SHARED_LIBRARY)
index 16cbc78..4294413 100644 (file)
@@ -26,7 +26,10 @@ LOCAL_SRC_FILES := \
        miniopt.c
 
 LOCAL_MODULE := dhdutil
-LOCAL_CFLAGS := -DSDTEST -DTARGETENV_android -Dlinux -DLINUX -mabi=aapcs-linux
+LOCAL_CFLAGS := -DSDTEST -DTARGETENV_android -Dlinux -DLINUX
+ifeq ($(TARGET_ARCH),arm)
+LOCAL_CFLAGS += -mabi=aapcs-linux
+endif
 LOCAL_C_INCLUDES +=$(LOCAL_PATH)/include
 
 LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)
index af3adf9..146e04d 100644 (file)
@@ -43,8 +43,10 @@ ifdef CONFIG_DRIVER_WEXT
 WPA_SRC_FILE += driver_cmd_wext.c
 endif
 
+ifeq ($(TARGET_ARCH),arm)
 # To force sizeof(enum) = 4
 L_CFLAGS += -mabi=aapcs-linux
+endif
 
 ifdef CONFIG_ANDROID_LOG
 L_CFLAGS += -DCONFIG_ANDROID_LOG