diff --git a/Android.bp b/Android.bp index 8f6b061..b320a20 100644 --- a/Android.bp +++ b/Android.bp @@ -1,5 +1,5 @@ // -// Copyright (C) 2022 The LineageOS Project +// Copyright (C) 2021-2024 The LineageOS Project // // SPDX-License-Identifier: Apache-2.0 // @@ -12,3 +12,10 @@ soong_namespace { "hardware/google/pixel", ], } + +install_symlink { + name: "firmware_WCNSS_qcom_cfg.ini_symlink", + vendor: true, + installed_location: "firmware/wlan/qca_cld/WCNSS_qcom_cfg.ini", + symlink_target: "/vendor/etc/wifi/qca6750/WCNSS_qcom_cfg.ini", +} diff --git a/Android.mk b/Android.mk index 2c81092..9b9c4e7 100644 --- a/Android.mk +++ b/Android.mk @@ -31,13 +31,4 @@ $(DSP_MOUNT_POINT): $(LOCAL_INSTALLED_MODULE) ALL_DEFAULT_INSTALLED_MODULES += $(FIRMWARE_MOUNT_POINT) $(BT_FIRMWARE_MOUNT_POINT) $(DSP_MOUNT_POINT) -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 /vendor/etc/wifi/qca6750/$(notdir $@) $@ - -ALL_DEFAULT_INSTALLED_MODULES += $(WCNSS_INI_SYMLINK) - endif diff --git a/device.mk b/device.mk index 8b8a2ea..af21519 100644 --- a/device.mk +++ b/device.mk @@ -456,6 +456,10 @@ PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/configs/wifi/p2p_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/p2p_supplicant_overlay.conf \ $(LOCAL_PATH)/configs/wifi/WCNSS_qcom_cfg.ini:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/qca6750/WCNSS_qcom_cfg.ini +# WiFi firmware symlinks +PRODUCT_PACKAGES += \ + firmware_WCNSS_qcom_cfg.ini_symlink + # WiFi Display PRODUCT_PACKAGES += \ libdisplayconfig.qti \