From b01d7514bc2935752401aae23a537d9babe79337 Mon Sep 17 00:00:00 2001 From: ZjemCiKolege Date: Mon, 9 Oct 2017 00:08:53 +0000 Subject: [PATCH] d855: Move wcnss to vendor need to work wifi Change-Id: I996082e0157a1d2103aefdceef41e9ba7c02fb6d --- Android.mk | 11 ++++++----- device.mk | 6 +++--- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Android.mk b/Android.mk index 2712155..7365707 100644 --- a/Android.mk +++ b/Android.mk @@ -28,10 +28,11 @@ LOCAL_PATH := $(call my-dir) ifneq ($(filter d855,$(TARGET_DEVICE)),) include $(call all-makefiles-under,$(LOCAL_PATH)) -# Create a link for the WCNSS config file, which ends up as a writable -# version in /data/misc/wifi -$(shell mkdir -p $(TARGET_OUT)/etc/firmware/wlan/prima; \ - ln -sf /data/misc/wifi/WCNSS_qcom_cfg.ini \ - $(TARGET_OUT)/etc/firmware/wlan/prima/WCNSS_qcom_cfg.ini) +WCNSS_CFG_SYMLINK := $(TARGET_OUT_VENDOR)/firmware/wlan/prima/WCNSS_qcom_cfg.ini +$(WCNSS_CFG_SYMLINK): $(LOCAL_INSTALLED_MODULE) + @mkdir -p $(dir $@) + $(hide) ln -sf /data/misc/wifi/$(notdir $@) $@ + +ALL_DEFAULT_INSTALLED_MODULES += $(WCNSS_CFG_SYMLINK) endif diff --git a/device.mk b/device.mk index fc8a782..52a92da 100644 --- a/device.mk +++ b/device.mk @@ -65,9 +65,9 @@ PRODUCT_PACKAGES += \ libfmjni PRODUCT_COPY_FILES += \ - device/lge/g3-common/wcnss/WCNSS_cfg.dat:system/etc/firmware/wlan/prima/WCNSS_cfg.dat \ - device/lge/g3-common/wcnss/WCNSS_qcom_cfg.ini:system/etc/wifi/WCNSS_qcom_cfg.ini \ - device/lge/g3-common/wcnss/WCNSS_qcom_wlan_nv.bin:system/etc/firmware/wlan/prima/WCNSS_qcom_wlan_nv.bin \ + device/lge/g3-common/wcnss/WCNSS_cfg.dat:system/vendor/firmware/wlan/prima/WCNSS_cfg.dat \ + device/lge/g3-common/wcnss/WCNSS_qcom_cfg.ini:system/vendor/etc/wifi/WCNSS_qcom_cfg.ini \ + device/lge/g3-common/wcnss/WCNSS_qcom_wlan_nv.bin:system/vendor/firmware/wlan/prima/WCNSS_qcom_wlan_nv.bin \ device/lge/g3-common/wcnss/p2p_supplicant_overlay.conf:system/etc/wifi/p2p_supplicant_overlay.conf \ device/lge/g3-common/wcnss/wpa_supplicant_overlay.conf:system/etc/wifi/wpa_supplicant_overlay.conf