summaryrefslogtreecommitdiff
path: root/wl1271/config/Android.mk
diff options
context:
space:
mode:
Diffstat (limited to 'wl1271/config/Android.mk')
-rw-r--r--wl1271/config/Android.mk19
1 files changed, 9 insertions, 10 deletions
diff --git a/wl1271/config/Android.mk b/wl1271/config/Android.mk
index faa351dc..8ebdfb26 100644
--- a/wl1271/config/Android.mk
+++ b/wl1271/config/Android.mk
@@ -18,16 +18,6 @@ LOCAL_PATH := $(call my-dir)
########################
include $(CLEAR_VARS)
-LOCAL_MODULE := wpa_supplicant.conf
-LOCAL_MODULE_TAGS := user
-LOCAL_MODULE_CLASS := ETC
-LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/wifi
-LOCAL_SRC_FILES := $(LOCAL_MODULE)
-include $(BUILD_PREBUILT)
-
-########################
-
-include $(CLEAR_VARS)
LOCAL_MODULE := tiwlan.ini
LOCAL_MODULE_TAGS := user
LOCAL_MODULE_CLASS := ETC
@@ -46,3 +36,12 @@ LOCAL_SRC_FILES := android_dhcpcd.conf
include $(BUILD_PREBUILT)
########################
+
+WIFI_DRIVER_SOCKET_IFACE := tiwlan0
+ifeq ($(strip $(WPA_SUPPLICANT_VERSION)),VER_0_6_X)
+ include external/wpa_supplicant_6/wpa_supplicant/wpa_supplicant_conf.mk
+else
+ include external/wpa_supplicant/wpa_supplicant_conf.mk
+endif
+
+########################