Merge "sepolicy: Merge local sysfs_led into global sysfs_leds."
diff --git a/device.mk b/device.mk
index b4dd001..8a5ef4f 100644
--- a/device.mk
+++ b/device.mk
@@ -267,6 +267,7 @@
     charger_res_images
 
 PRODUCT_PACKAGES += \
+    android.hardware.wifi@1.0-service \
     libwpa_client \
     hostapd \
     wlutil \
diff --git a/init.angler.rc b/init.angler.rc
index 9b02b47..dcc4983 100755
--- a/init.angler.rc
+++ b/init.angler.rc
@@ -143,6 +143,9 @@
     write /sys/block/mmcblk0/queue/rq_affinity 0
     write /sys/block/mmcblk0/queue/scheduler noop
 
+    # Wifi firmware reload path
+    chown wifi wifi /sys/module/bcmdhd/parameters/firmware_path
+
 on property:init.svc.per_mgr=running
     start per_proxy
 
@@ -381,7 +384,7 @@
     group input
     writepid /dev/cpuset/system-background/tasks
 
-service wpa_supplicant /system/bin/wpa_supplicant \
+service wpa_supplicant /vendor/bin/hw/wpa_supplicant \
         -iwlan0 -Dnl80211 -c/data/misc/wifi/wpa_supplicant.conf \
         -I/system/etc/wifi/p2p_supplicant_overlay.conf \
         -O/data/misc/wifi/sockets \