commit fa235357d92198192aa4d6779b94766a4a4287f2
author Ming-yi Lin <mylin@codeaurora.org> Wed Mar 20 16:30:36 2013 +0800
committer Ming-yi Lin <mylin@codeaurora.org> Thu Mar 21 18:24:42 2013 +0800
tree 2c63a5e93c1e6d3931921f7f033d51d8be8c1e8f
parent 5e1d225ff92f9b82194bc4b6df501ed6ceda97e0

wlan: Use different wpa_supplicant.conf between wcn and ath6kl driver

For different wlan driver (wcn and ath6kl), it needs to use different
wpa_supplicant.conf. Seperate it as wpa_supplicant_wcn.conf and
wpa_supplicant_ath6kl.conf for wlan usage.

CRs-Fixed: 465923
Change-Id: Ic9e5ec88142905327551180a6af7ac9dd40c4c61

AndroidBoard.mk

diff --git a/AndroidBoard.mk b/AndroidBoard.mk
index 732949b..5e19525 100644
--- a/AndroidBoard.mk
+++ b/AndroidBoard.mk
@@ -91,9 +91,19 @@
 LOCAL_SRC_FILES    := $(LOCAL_MODULE)
 include $(BUILD_PREBUILT)
 
+ifeq ($(strip $(BOARD_HAS_ATH_WLAN_AR6004)),true)
+include $(CLEAR_VARS)
+LOCAL_MODULE       := wpa_supplicant_ath6kl.conf
+LOCAL_MODULE_TAGS  := optional
+LOCAL_MODULE_CLASS := ETC
+LOCAL_SRC_FILES    := $(LOCAL_MODULE)
+LOCAL_MODULE_PATH  := $(TARGET_OUT_ETC)/wifi
+include $(BUILD_PREBUILT)
+endif
+
 ifeq ($(strip $(BOARD_HAS_QCOM_WLAN)),true)
 include $(CLEAR_VARS)
-LOCAL_MODULE       := wpa_supplicant.conf
+LOCAL_MODULE       := wpa_supplicant_wcn.conf
 LOCAL_MODULE_TAGS  := optional
 LOCAL_MODULE_CLASS := ETC
 LOCAL_SRC_FILES    := $(LOCAL_MODULE)