diff options
| author | Ying Wang <wangying@google.com> | 2010-05-06 15:21:06 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2010-05-06 15:21:06 -0700 |
| commit | ef16b664c1625f80f5eb08ac05f54fc9501a8ca4 (patch) | |
| tree | 147567bf991dcb58a59376e68745f1f8d0f35162 | |
| parent | a2d6d65d131c4e9371563101dd4e76b51cb2fa75 (diff) | |
| download | wlan-ef16b664c1625f80f5eb08ac05f54fc9501a8ca4.tar.gz | |
Apply generating wpa_supplicant.conf on the fly.
Change-Id: I6dc16a42c87c888b3c6ff732f985af1c971ef19e
http://b/issue?id=1800203
| -rw-r--r-- | wl1271/config/Android.mk | 19 | ||||
| -rw-r--r-- | wl1271/config/wpa_supplicant.conf | 6 |
2 files changed, 9 insertions, 16 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 + +######################## diff --git a/wl1271/config/wpa_supplicant.conf b/wl1271/config/wpa_supplicant.conf deleted file mode 100644 index 638a61e4..00000000 --- a/wl1271/config/wpa_supplicant.conf +++ /dev/null @@ -1,6 +0,0 @@ -##### wpa_supplicant configuration file template ##### -update_config=1 -ctrl_interface=tiwlan0 -eapol_version=1 -ap_scan=1 -fast_reauth=1 |