Merge "base.mk: add FST Manager to the build"

base.mk

@@ -621,6 +621,10 @@ CRDA += init.crda.sh
 WLAN := prima_wlan.ko
 WLAN += pronto_wlan.ko
 
+#FSTMAN
+FSTMAN := fstman
+FSTMAN += fstman.ini
+
 PRODUCT_PACKAGES := \
     AccountAndSyncSettings \
     DeskClock \
@@ -739,6 +743,7 @@ PRODUCT_PACKAGES += $(VT_QTI_PERMISSIONS)
 PRODUCT_PACKAGES += $(CRDA)
 PRODUCT_PACKAGES += $(WLAN)
 PRODUCT_PACKAGES += $(IPACM)
+PRODUCT_PACKAGES += $(FSTMAN)
 
 # Live Wallpapers
 PRODUCT_PACKAGES += \

rootdir/etc/init.qcom.rc

@@ -605,11 +605,22 @@ service wpa_supplicant /system/bin/wpa_supplicant \
     disabled
     oneshot
 
+# FST Manager is started by property_set("ctl.start", "fstman:<hostap ctrl iface>");
+service fstman /system/bin/fstman -B -ddd -n -c /data/misc/wifi/fstman.ini
+    class main
+    disabled
+    oneshot
+
 service dhcpcd_wlan0 /system/bin/dhcpcd -ABKLG
     class late_start
     disabled
     oneshot
 
+service dhcpcd_bond0 /system/bin/dhcpcd -ABKLG
+    class late_start
+    disabled
+    oneshot
+
 service dhcpcd_p2p /system/bin/dhcpcd -ABKLG
     class late_start
     disabled
@@ -620,6 +631,11 @@ service iprenew_wlan0 /system/bin/dhcpcd -n
     disabled
     oneshot
 
+service iprenew_bond0 /system/bin/dhcpcd -n
+    class late_start
+    disabled
+    oneshot
+
 service iprenew_p2p /system/bin/dhcpcd -n
     class late_start
     disabled