diff options
| author | codeworkx <daniel.hillenbrand@codeworkx.de> | 2018-02-05 19:42:43 +0100 |
|---|---|---|
| committer | Davide Garberi <dade.garberi@gmail.com> | 2018-02-11 15:41:16 +0100 |
| commit | 08494fd28541753d65f0b98c3d504a13eed2ac05 (patch) | |
| tree | 9ee024f22c6e41174b4a127b80ac5f76f1174d99 | |
| parent | 8a14590c006b3d8404a44556393728b56fb2f490 (diff) | |
msm8996: move wifi configs to vendor
Change-Id: Icff15c4fb5afd227c68c11a48f37d5cf8a765b8a
Signed-off-by: Davide Garberi <dade.garberi@gmail.com>
| -rw-r--r-- | Android.mk | 6 | ||||
| -rwxr-xr-x | msm8996.mk | 22 | ||||
| -rwxr-xr-x | rootdir/etc/init.qcom.rc | 4 |
3 files changed, 18 insertions, 14 deletions
@@ -67,14 +67,14 @@ $(RFS_MSM_MPSS_SYMLINKS): $(LOCAL_INSTALLED_MODULE) ALL_DEFAULT_INSTALLED_MODULES += $(RFS_MSM_ADSP_SYMLINKS) $(RFS_MSM_MPSS_SYMLINKS) -WCNSS_INI_SYMLINK := $(TARGET_OUT_ETC)/firmware/wlan/qca_cld/WCNSS_qcom_cfg.ini +WCNSS_INI_SYMLINK := $(TARGET_OUT_VENDOR)/firmware/wlan/qca_cld/WCNSS_qcom_cfg.ini $(WCNSS_INI_SYMLINK): $(LOCAL_INSTALLED_MODULE) @echo "WCNSS config ini link: $@" @mkdir -p $(dir $@) @rm -rf $@ - $(hide) ln -sf /system/etc/wifi/$(notdir $@) $@ + $(hide) ln -sf /vendor/etc/wifi/$(notdir $@) $@ -WCNSS_MAC_SYMLINK := $(TARGET_OUT_ETC)/firmware/wlan/qca_cld/wlan_mac.bin +WCNSS_MAC_SYMLINK := $(TARGET_OUT_VENDOR)/firmware/wlan/qca_cld/wlan_mac.bin $(WCNSS_MAC_SYMLINK): $(LOCAL_INSTALLED_MODULE) @echo "WCNSS MAC bin link: $@" @mkdir -p $(dir $@) @@ -284,19 +284,23 @@ PRODUCT_PACKAGES += \ # Wifi PRODUCT_PACKAGES += \ - libwpa_client \ - wificond \ - wifilogd \ - wlutil \ hostapd \ - readmac \ + hostapd_cli \ + libqsap_sdk \ + libQWiFiSoftApCfg \ + libwifi-hal-qcom \ + wificond \ wpa_supplicant \ wpa_supplicant.conf +PRODUCT_PACKAGES += \ + ipacm \ + IPACM_cfg.xml + 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:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/p2p_supplicant_overlay.conf \ + $(LOCAL_PATH)/wifi/wpa_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/wpa_supplicant_overlay.conf PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/wifi/WCNSS_qcom_cfg.ini:system/etc/wifi/WCNSS_qcom_cfg.ini \ - $(LOCAL_PATH)/wifi/WCNSS_cfg.dat:system/etc/firmware/wlan/qca_cld/WCNSS_cfg.dat + $(LOCAL_PATH)/wifi/WCNSS_cfg.dat:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/WCNSS_cfg.dat \ + $(LOCAL_PATH)/wifi/WCNSS_qcom_cfg.ini:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/WCNSS_qcom_cfg.ini diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc index 7e99689..dd6c901 100755 --- a/rootdir/etc/init.qcom.rc +++ b/rootdir/etc/init.qcom.rc @@ -821,9 +821,9 @@ on property:sys.sysctl.tcp_adv_win_scale=* 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/system/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/system/vendor/etc/wifi/wpa_supplicant_overlay.conf \ -O/data/misc/wifi/sockets -puse_p2p_group_interface=1 -dd \ -e/data/misc/wifi/entropy.bin -g@android:wpa_wlan0 # we will start as root and wpa_supplicant will switch to user wifi |