diff options
| author | Keun-young Park <keunyoung@google.com> | 2013-03-27 16:32:34 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-03-27 16:32:34 +0000 |
| commit | 3c8dbe8d5ba9a41e473dd010ac74f790865bdc0a (patch) | |
| tree | a79c677c49fa5d4c339fd70a1004507981829c8b | |
| parent | 03345d0caa2c5fa7314ffc41030646ed0712ae0a (diff) | |
| parent | 918e37c29b99ff90e0d5ef9a39e46c3050e563c8 (diff) | |
| download | wlan-3c8dbe8d5ba9a41e473dd010ac74f790865bdc0a.tar.gz | |
Merge changes I66ab2865,I92ed31bftools_r22jb-mr1.1-dev-plus-aosp
* changes:
Conditionalise ARM specific compiler option
Conditionalise ARM specific compiler option
| -rw-r--r-- | bcm4329/dhdutil/Android.mk | 5 | ||||
| -rw-r--r-- | bcm4329/wpa_supplicant_8_lib/Android.mk | 2 | ||||
| -rw-r--r-- | bcmdhd/bcmdhd_net_iface/Android.mk | 2 | ||||
| -rw-r--r-- | bcmdhd/dhdutil/Android.mk | 5 | ||||
| -rw-r--r-- | bcmdhd/wpa_supplicant_8_lib/Android.mk | 2 |
5 files changed, 14 insertions, 2 deletions
diff --git a/bcm4329/dhdutil/Android.mk b/bcm4329/dhdutil/Android.mk index bc4c27b..c4a8586 100644 --- a/bcm4329/dhdutil/Android.mk +++ b/bcm4329/dhdutil/Android.mk @@ -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) diff --git a/bcm4329/wpa_supplicant_8_lib/Android.mk b/bcm4329/wpa_supplicant_8_lib/Android.mk index 5b50255..157b510 100644 --- a/bcm4329/wpa_supplicant_8_lib/Android.mk +++ b/bcm4329/wpa_supplicant_8_lib/Android.mk @@ -33,8 +33,10 @@ WPA_SUPPL_DIR_INCLUDE = $(WPA_SUPPL_DIR)/src \ $(WPA_SUPPL_DIR)/src/wps \ $(WPA_SUPPL_DIR)/wpa_supplicant +ifeq ($(TARGET_ARCH),arm) # To force sizeof(enum) = 4 L_CFLAGS += -mabi=aapcs-linux +endif ifdef CONFIG_ANDROID_LOG L_CFLAGS += -DCONFIG_ANDROID_LOG diff --git a/bcmdhd/bcmdhd_net_iface/Android.mk b/bcmdhd/bcmdhd_net_iface/Android.mk index be22624..c5dc34d 100644 --- a/bcmdhd/bcmdhd_net_iface/Android.mk +++ b/bcmdhd/bcmdhd_net_iface/Android.mk @@ -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) diff --git a/bcmdhd/dhdutil/Android.mk b/bcmdhd/dhdutil/Android.mk index bc4c27b..c4a8586 100644 --- a/bcmdhd/dhdutil/Android.mk +++ b/bcmdhd/dhdutil/Android.mk @@ -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) diff --git a/bcmdhd/wpa_supplicant_8_lib/Android.mk b/bcmdhd/wpa_supplicant_8_lib/Android.mk index af3adf9..146e04d 100644 --- a/bcmdhd/wpa_supplicant_8_lib/Android.mk +++ b/bcmdhd/wpa_supplicant_8_lib/Android.mk @@ -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 |