jacinto6evm: switch to AOSP wpa_supplicant

Switch from TI wpa_supplicant to Android's wpa_supplicant.
This requires changing Board configurations and wlan related
service defenitions.

Change-Id: Ic4770ce3d3103fc9d7cafe6ef5b0a4e79c5991fa
Signed-off-by: Vishal Mahaveer <vishalm@ti.com>

3 files changed, 15 insertions, 8 deletions

diff --git a/BoardConfig.mk b/BoardConfig.mk
index 44466d6..f96e96c 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -61,11 +61,14 @@ TARGET_RELEASETOOLS_EXTENSIONS := device/ti/jacinto6evm
 USES_TI_MAC80211 := true
 ifeq ($(USES_TI_MAC80211),true)
 BOARD_WPA_SUPPLICANT_DRIVER := NL80211
-WPA_SUPPLICANT_VERSION      := VER_0_8_X_TI
+WPA_SUPPLICANT_VERSION      := VER_0_8_X
 BOARD_HOSTAPD_DRIVER        := NL80211
+BOARD_WPA_SUPPLICANT_PRIVATE_LIB  := lib_driver_cmd_wl12xx
+BOARD_HOSTAPD_PRIVATE_LIB         := lib_driver_cmd_wl12xx
 BOARD_WLAN_DEVICE           := wl12xx_mac80211
 BOARD_SOFTAP_DEVICE         := wl12xx_mac80211
 COMMON_GLOBAL_CFLAGS += -DUSES_TI_MAC80211
+COMMON_GLOBAL_CFLAGS += -DANDROID_P2P_STUB
 endif
 
 BOARD_SEPOLICY_DIRS := device/ti/jacinto6evm/sepolicy
diff --git a/device.mk b/device.mk
index 45a111e..d01effc 100644
--- a/device.mk
+++ b/device.mk
@@ -80,6 +80,7 @@ PRODUCT_PROPERTY_OVERRIDES += \
 PRODUCT_PACKAGES += \
         wpa_supplicant \
         wpa_supplicant.conf \
+        wpa_supplicant_overlay.conf \
         libwpa_client \
         hostapd \
         hostapd.conf \
diff --git a/init.jacinto6evmboard.rc b/init.jacinto6evmboard.rc
index 321ae10..7a4327c 100644
--- a/init.jacinto6evmboard.rc
+++ b/init.jacinto6evmboard.rc
@@ -93,19 +93,22 @@ service sdcard /system/bin/sdcard -u 1023 -g 1023 -l /data/media /mnt/shell/emul
     class late_start
 
 service p2p_supplicant /system/bin/wpa_supplicant \
-    -iwlan0 -Dnl80211 -c/data/misc/wifi/wpa_supplicant.conf -N \
-    -ip2p0 -Dnl80211 -c/data/misc/wifi/p2p_supplicant.conf \
-    -O/data/misc/wifi/sockets -g@android:wpa_wlan0
-    class main
+    -iwlan0 -Dnl80211 -c/data/misc/wifi/wpa_supplicant.conf \
+    -I/system/etc/wifi/wpa_supplicant_overlay.conf \
+    -O/data/misc/wifi/sockets -pp2p_device=1\
+    -e/data/misc/wifi/entropy.bin -g@android:wpa_wlan0
     socket wpa_wlan0 dgram 660 wifi wifi
+    class late_start
     disabled
     oneshot
 
 service wpa_supplicant /system/bin/wpa_supplicant \
-    -iwlan0 -Dnl80211 -c/data/misc/wifi/wpa_supplicant.conf -e/data/misc/wifi/entropy.bin \
-    -O/data/misc/wifi/sockets -g@android:wpa_wlan0
-    class main
+    -iwlan0 -Dnl80211 -c/data/misc/wifi/wpa_supplicant.conf \
+    -I/system/etc/wifi/wpa_supplicant_overlay.conf \
+    -O/data/misc/wifi/sockets \
+    -e/data/misc/wifi/entropy.bin -g@android:wpa_wlan0
     socket wpa_wlan0 dgram 660 wifi wifi
+    class late_start
     disabled
     oneshot