diff options
Diffstat (limited to 'wl1271/CUDK/os/linux/src/Android.mk')
| -rw-r--r-- | wl1271/CUDK/os/linux/src/Android.mk | 65 |
1 files changed, 42 insertions, 23 deletions
diff --git a/wl1271/CUDK/os/linux/src/Android.mk b/wl1271/CUDK/os/linux/src/Android.mk index 3ae1e403..ec1e47e7 100644 --- a/wl1271/CUDK/os/linux/src/Android.mk +++ b/wl1271/CUDK/os/linux/src/Android.mk @@ -14,19 +14,36 @@ endif WILINK_ROOT = ../../../.. CUDK_ROOT = $(WILINK_ROOT)/CUDK -TI_SUPP_LIB_DIR = $(WILINK_ROOT)/../../../../external/wpa_supplicant +ifndef WPA_SUPPLICANT_VERSION +WPA_SUPPLICANT_VERSION := VER_0_5_X +endif + +ifeq ($(WPA_SUPPLICANT_VERSION),VER_0_5_X) +WPA_SUPPL_DIR = external/wpa_supplicant +else +WPA_SUPPL_DIR = external/wpa_supplicant_6/wpa_supplicant +endif +WPA_SUPPL_DIR_INCLUDE = $(WPA_SUPPL_DIR) +ifeq ($(WPA_SUPPLICANT_VERSION),VER_0_6_X) +WPA_SUPPL_DIR_INCLUDE += $(WPA_SUPPL_DIR)/src \ + $(WPA_SUPPL_DIR)/src/common \ + $(WPA_SUPPL_DIR)/src/drivers \ + $(WPA_SUPPL_DIR)/src/l2_packet \ + $(WPA_SUPPL_DIR)/src/utils \ + $(WPA_SUPPL_DIR)/src/wps +endif DK_DEFINES = ifeq ($(WPA_ENTERPRISE), y) - DK_DEFINES += -D WPA_ENTERPRISE +DK_DEFINES += -D WPA_ENTERPRISE endif ifeq ($(BUILD_SUPPL), y) - DK_DEFINES += -D WPA_SUPPLICANT -D CONFIG_CTRL_IFACE -D CONFIG_CTRL_IFACE_UNIX - -include external/wpa_supplicant/.config - ifeq ($(CONFIG_WPS), y) - DK_DEFINES += -DCONFIG_WPS - endif +DK_DEFINES += -D WPA_SUPPLICANT -D CONFIG_CTRL_IFACE -D CONFIG_CTRL_IFACE_UNIX +-include $(WPA_SUPPL_DIR)/.config + ifeq ($(CONFIG_WPS), y) + DK_DEFINES += -DCONFIG_WPS + endif endif LOCAL_CFLAGS += \ @@ -42,29 +59,31 @@ LOCAL_SRC_FILES:= \ osapi.c ifeq ($(BUILD_SUPPL), y) -LOCAL_SRC_FILES += \ - $(TI_SUPP_LIB_DIR)/wpa_ctrl.c + ifeq ($(WPA_SUPPLICANT_VERSION),VER_0_5_X) + LOCAL_SRC_FILES += $(WPA_SUPPL_DIR)/wpa_ctrl.c + else + LOCAL_SRC_FILES += $(WPA_SUPPL_DIR)/common/src/wpa_ctrl.c + endif endif LOCAL_C_INCLUDES := \ - $(LOCAL_PATH)/../inc \ - $(LOCAL_PATH)/../../common/inc \ - $(LOCAL_PATH)/$(WILINK_ROOT)/stad/Export_Inc \ - $(LOCAL_PATH)/$(WILINK_ROOT)/stad/src/Sta_Management \ - $(LOCAL_PATH)/$(WILINK_ROOT)/stad/src/Application \ - $(LOCAL_PATH)/$(WILINK_ROOT)/utils \ - $(LOCAL_PATH)/$(WILINK_ROOT)/Txn \ - $(LOCAL_PATH)/$(WILINK_ROOT)/TWD/TWDriver \ + $(LOCAL_PATH)/../inc \ + $(LOCAL_PATH)/../../common/inc \ + $(LOCAL_PATH)/$(WILINK_ROOT)/stad/Export_Inc \ + $(LOCAL_PATH)/$(WILINK_ROOT)/stad/src/Sta_Management \ + $(LOCAL_PATH)/$(WILINK_ROOT)/stad/src/Application \ + $(LOCAL_PATH)/$(WILINK_ROOT)/utils \ + $(LOCAL_PATH)/$(WILINK_ROOT)/Txn \ + $(LOCAL_PATH)/$(WILINK_ROOT)/TWD/TWDriver \ $(LOCAL_PATH)/$(WILINK_ROOT)/TWD/FirmwareApi \ $(LOCAL_PATH)/$(WILINK_ROOT)/TWD/FW_Transfer/Export_Inc \ $(LOCAL_PATH)/$(WILINK_ROOT)/TWD/TwIf \ - $(LOCAL_PATH)/$(WILINK_ROOT)/platforms/os/linux/inc \ - $(LOCAL_PATH)/$(WILINK_ROOT)/platforms/os/common/inc \ - $(LOCAL_PATH)/$(WILINK_ROOT)/TWD/FirmwareApi \ - external/wpa_supplicant \ - $(LOCAL_PATH)/$(CUDK_ROOT)/configurationutility/inc + $(LOCAL_PATH)/$(WILINK_ROOT)/platforms/os/linux/inc \ + $(LOCAL_PATH)/$(WILINK_ROOT)/platforms/os/common/inc \ + $(LOCAL_PATH)/$(WILINK_ROOT)/TWD/FirmwareApi \ + $(LOCAL_PATH)/$(CUDK_ROOT)/configurationutility/inc \ + $(WPA_SUPPL_DIR_INCLUDE) LOCAL_MODULE := libtiOsLib include $(BUILD_STATIC_LIBRARY) - |