From c86d342b4189dd63d153d0e243ddda0b3a2835f6 Mon Sep 17 00:00:00 2001 From: Bruno Martins Date: Sun, 24 Dec 2017 02:29:51 +0000 Subject: [PATCH] msm8976-common: Move Wi-Fi files to vendor Change-Id: I7e95baa01490ec76cf8ddfa051f01fc9b0bc5c7a --- msm8976.mk | 10 +++++----- rootdir/etc/init.qcom.rc | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/msm8976.mk b/msm8976.mk index c1a369e..4f28454 100644 --- a/msm8976.mk +++ b/msm8976.mk @@ -269,9 +269,9 @@ PRODUCT_PACKAGES += \ # WCNSS PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/wifi/WCNSS_cfg.dat:system/etc/firmware/wlan/qca_cld/WCNSS_cfg.dat \ - $(LOCAL_PATH)/wifi/WCNSS_qcom_cfg.ini:system/etc/firmware/wlan/qca_cld/WCNSS_qcom_cfg.ini \ - $(LOCAL_PATH)/wifi/WCNSS_qcom_sdio_cfg.ini:system/etc/wifi/WCNSS_qcom_sdio_cfg.ini + $(LOCAL_PATH)/wifi/WCNSS_cfg.dat:system/vendor/firmware/wlan/qca_cld/WCNSS_cfg.dat \ + $(LOCAL_PATH)/wifi/WCNSS_qcom_cfg.ini:system/vendor/firmware/wlan/qca_cld/WCNSS_qcom_cfg.ini \ + $(LOCAL_PATH)/wifi/WCNSS_qcom_sdio_cfg.ini:system/vendor/etc/wifi/WCNSS_qcom_sdio_cfg.ini # WiFi HAL PRODUCT_PACKAGES += \ @@ -287,5 +287,5 @@ PRODUCT_PACKAGES += \ wpa_supplicant.conf PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/wifi/p2p_supplicant_overlay.conf:system/etc/wifi/p2p_supplicant_overlay.conf \ - $(LOCAL_PATH)/wifi/wpa_supplicant_overlay.conf:system/etc/wifi/wpa_supplicant_overlay.conf + $(LOCAL_PATH)/wifi/p2p_supplicant_overlay.conf:system/vendor/etc/wifi/p2p_supplicant_overlay.conf \ + $(LOCAL_PATH)/wifi/wpa_supplicant_overlay.conf:system/vendor/etc/wifi/wpa_supplicant_overlay.conf diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc index 9404e72..d5f4a5b 100644 --- a/rootdir/etc/init.qcom.rc +++ b/rootdir/etc/init.qcom.rc @@ -1409,11 +1409,11 @@ on property:ro.data.large_tcp_window_size=true on property:sys.sysctl.tcp_adv_win_scale=* write /proc/sys/net/ipv4/tcp_adv_win_scale ${sys.sysctl.tcp_adv_win_scale} -service wpa_supplicant /system/vendor/bin/hw/wpa_supplicant \ +service wpa_supplicant /vendor/bin/hw/wpa_supplicant \ -ip2p0 -Dnl80211 -c/data/misc/wifi/p2p_supplicant.conf \ - -I/system/etc/wifi/p2p_supplicant_overlay.conf -N \ + -I/vendor/etc/wifi/p2p_supplicant_overlay.conf -N \ -iwlan0 -Dnl80211 -c/data/misc/wifi/wpa_supplicant.conf \ - -I/system/etc/wifi/wpa_supplicant_overlay.conf \ + -I/vendor/etc/wifi/wpa_supplicant_overlay.conf \ -O/data/misc/wifi/sockets -puse_p2p_group_interface=1 \ -e/data/misc/wifi/entropy.bin -g@android:wpa_wlan0 # we will start as root and wpa_supplicant will switch to user wifi