commit e488f7f82b784cb3bd8cf92806ce84002d03fe00
author Ying Wang <wangying@google.com> Thu May 06 15:07:23 2010 -0700
committer Ying Wang <wangying@google.com> Thu May 06 15:07:23 2010 -0700
tree 593b93fb538f896bb5fd0662857da54ad45887f4
parent cba5fec4b3bc61e9676db16240b0710a9d530464

Include correct wpa_supplicant.conf with different WPA_SUPPLICANT_VERSION

Change-Id: I1e0ef0634803fd35291b6bd291a563c83cbb5783

bcm4329/config/Android.mk

diff --git a/bcm4329/config/Android.mk b/bcm4329/config/Android.mk
index 382bd73..9597016 100644
--- a/bcm4329/config/Android.mk
+++ b/bcm4329/config/Android.mk
@@ -28,6 +28,10 @@
 #########################
 
 WIFI_DRIVER_SOCKET_IFACE := eth0
-include external/wpa_supplicant/wpa_supplicant_conf.mk
+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
 
 #######################