Revert "gta4xl-common: move wifi.rc to devicetree"
* No longer needed, R stock moved wpa_supplicant
to a separate init too
This reverts commit a2795fdcc6c41135139eaff563cdbd02b1490c78.
Change-Id: I2057654904edccc040a91d093688383b202491ed
diff --git a/config/init/Android.mk b/config/init/Android.mk
index 78f5796..47ba172 100644
--- a/config/init/Android.mk
+++ b/config/init/Android.mk
@@ -51,10 +51,3 @@
LOCAL_MODULE_CLASS := ETC
LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_ETC)/init
include $(BUILD_PREBUILT)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := wifi_sec.rc
-LOCAL_SRC_FILES := wifi_sec.rc
-LOCAL_MODULE_CLASS := ETC
-LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_ETC)/init
-include $(BUILD_PREBUILT)
diff --git a/config/init/wifi_sec.rc b/config/init/wifi_sec.rc
deleted file mode 100644
index 9a95ef7..0000000
--- a/config/init/wifi_sec.rc
+++ /dev/null
@@ -1,67 +0,0 @@
-# Wi-Fi init file
-on post-fs-data
- mkdir /data/vendor 0771 root system
- mkdir /data/vendor/log 0771 root system
- mkdir /data/vendor/conn 0771 wifi wifi
- mkdir /data/vendor/wifi 0771 wifi wifi
- mkdir /data/vendor/wifi/wpa 0770 wifi wifi
- mkdir /data/vendor/wifi/wpa/sockets 0770 wifi wifi
- mkdir /data/vendor/log/wifi 0770 wifi system
-
- # for WIFI TRP/TIS
- chown wifi wifi /data/vendor/conn/.psm.info
- chmod 0640 /data/vendor/conn/.psm.info
-
- # for WIFI Antenna Selection
- chown wifi wifi /data/vendor/conn/.ant.info
- chmod 0640 /data/vendor/conn/.ant.info
-
- # for WIFI Version
- chown wifi wifi /data/vendor/conn/.wifiver.info
- chmod 0644 /data/vendor/conn/.wifiver.info
-
- # for WIFI MEMDUMP
- # The default value of below memdump file is set in SecProductFeature
- #write /data/vendor/conn/.memdump.info 2
- chown wifi wifi /data/vendor/conn/.memdump.info
- chmod 0640 /data/vendor/conn/.memdump.info
-
- # for WIFI hotspot
- chown wifi wifi /data/vendor/conn/.softap.info
- chmod 0644 /data/vendor/conn/.softap.info
- chown system wifi /vendor/etc/wifi/indoorchannel.info
- chmod 0664 /vendor/etc/wifi/indoorchannel.info
-
- # for WIFI MAC
- chown wifi wifi /sys/wifi/mac_addr
- chmod 0640 /sys/wifi/mac_addr
-
-on boot
- setprop wifi.interface wlan0
-
-# start for WiFi MFG (TestMode)
-service mfgloader /system/vendor/bin/hw/mfgloader
- class main
- user wifi
- group wifi inet net_raw net_admin
- capabilities NET_ADMIN NET_RAW SYS_MODULE
- disabled
- oneshot
-
-service macloader /system/vendor/bin/hw/macloader
- class main
- user wifi
- group wifi inet net_raw net_admin
- capabilities NET_ADMIN NET_RAW SYS_MODULE
- oneshot
-
-service wlandutservice /system/bin/wlandutservice
- class main
- user system
- group system wifi net_raw net_admin inet
- capabilities NET_ADMIN NET_RAW
- disabled
- oneshot
-
-# end of WiFi MFG (TestMode)
-
diff --git a/platform/init.mk b/platform/init.mk
index 1abe6d5..8130d17 100644
--- a/platform/init.mk
+++ b/platform/init.mk
@@ -8,5 +8,4 @@
init.exynos9611.rc \
init.exynos9611.usb.rc \
fstab.exynos9611 \
- ueventd.exynos9611.rc \
- wifi_sec.rc
+ ueventd.exynos9611.rc
diff --git a/proprietary-files.txt b/proprietary-files.txt
index 7344bb2..c80e8ef 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -239,6 +239,7 @@
### WIFI
vendor/bin/hw/macloader
vendor/bin/wlbtd
+vendor/etc/init/wifi.rc
vendor/etc/init/wifi_slsi.rc
vendor/etc/wifi/hydra_config.sdb
vendor/etc/wifi/indoorchannel.info