diff options
| author | Elliott Hughes <enh@google.com> | 2013-07-25 17:54:30 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-07-25 17:54:30 -0700 |
| commit | 77014ad6e75fc0d348bbf778f9a9a5079cd4c77e (patch) | |
| tree | eacc003508dcfad964015ec67199d935e8077283 | |
| parent | 020e62f367e976ce29580cfb3b0b7abb0c2745df (diff) | |
| parent | 67cc5028fbc14ed90508ded0d1f4ef75472d8cbd (diff) | |
| download | wlan-77014ad6e75fc0d348bbf778f9a9a5079cd4c77e.tar.gz | |
am 67cc5028: Merge "Remove assumption about use of ARM compiler."
* commit '67cc5028fbc14ed90508ded0d1f4ef75472d8cbd':
Remove assumption about use of ARM compiler.
| -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 |