diff options
| author | Elliott Hughes <enh@google.com> | 2013-07-26 00:45:19 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-07-26 00:45:19 +0000 |
| commit | 67cc5028fbc14ed90508ded0d1f4ef75472d8cbd (patch) | |
| tree | 3764da80645256f897ed705168bd9fd9847387e9 | |
| parent | 7106a91cff7bd3578eb8c07b4348c9c262f89bb8 (diff) | |
| parent | ca0ccf9916466edad7ef26c65bc1d06b85aec598 (diff) | |
| download | platform_hardware_broadcom_wlan-tools_r22.2.tar.gz platform_hardware_broadcom_wlan-tools_r22.2.tar.bz2 platform_hardware_broadcom_wlan-tools_r22.2.zip | |
Merge "Remove assumption about use of ARM compiler."tools_r22.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 |
3 files changed, 8 insertions, 1 deletions
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 16cbc78..4294413 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 |