wifi: Fixup wifi to use new hal bits

Message ID 1491541141-2882-1-git-send-email-john.stultz@linaro.org
State New
Headers show

Commit Message

John Stultz April 7, 2017, 4:59 a.m.
Pull in fixes to get wifi working again on flo

Cc: Rob Herring <rob.herring@linaro.org>
Cc: Sumit Semwal <sumit.semwal@linaro.org>
Cc: Amit Pundir <amit.pundir@linaro.org>
Cc: Vishal Bhoj <vishal.bhoj@linaro.org>
Signed-off-by: John Stultz <john.stultz@linaro.org>

---
 wifi/device.mk | 2 ++
 wifi/wifi.rc   | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

-- 
2.7.4

Patch

diff --git a/wifi/device.mk b/wifi/device.mk
index 23d5f02..fed3dc0 100644
--- a/wifi/device.mk
+++ b/wifi/device.mk
@@ -5,6 +5,8 @@  PRODUCT_PACKAGES := \
 		hostapd \
 		wpa_supplicant \
 		wificond \
+		android.hardware.wifi@1.0-service \
+
 
 PRODUCT_COPY_FILES := \
 	frameworks/native/data/etc/android.hardware.wifi.xml:system/etc/permissions/android.hardware.wifi.xml \
diff --git a/wifi/wifi.rc b/wifi/wifi.rc
index d270f7f..164c771 100644
--- a/wifi/wifi.rc
+++ b/wifi/wifi.rc
@@ -1,4 +1,4 @@ 
-service wpa_supplicant /system/bin/wpa_supplicant \
+service wpa_supplicant /system/vendor/bin/hw/wpa_supplicant \
 			-iwlan0 -c/data/misc/wifi/wpa_supplicant.conf \
 			-e/data/misc/wifi/entropy.bin -g@android:wpa_wlan0
 	socket wpa_wlan0 dgram 660 wifi wifi