FP5: Convert WiFi firmware symlink to install_symlink target
The last bit that was preventing building hermetic images.
Change-Id: I75bb7de4593a7992f6015317cf97e088beeba0cb
diff --git a/Android.bp b/Android.bp
index 40aaa74..87799d8 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,5 +1,5 @@
//
-// SPDX-FileCopyrightText: 2021 The LineageOS Project
+// SPDX-FileCopyrightText: 2021-2024 The LineageOS Project
// SPDX-License-Identifier: Apache-2.0
//
@@ -13,3 +13,10 @@
installed_location: "firmware/aw_cali.bin",
symlink_target: "/mnt/vendor/persist/factory/audio/aw_cali.bin",
}
+
+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 8a006e7..6f97da9 100644
--- a/Android.mk
+++ b/Android.mk
@@ -28,12 +28,4 @@
@mkdir -p $(TARGET_OUT_VENDOR)/dsp
ALL_DEFAULT_INSTALLED_MODULES += $(FIRMWARE_MOUNT_POINT) $(BT_FIRMWARE_MOUNT_POINT) $(DSP_MOUNT_POINT)
-
-WIFI_FIRMWARE_SYMLINKS := $(TARGET_OUT_VENDOR)/firmware/wlan/qca_cld
-$(WIFI_FIRMWARE_SYMLINKS): $(LOCAL_INSTALLED_MODULE)
- @echo "Creating wifi firmware symlinks: $@"
- @mkdir -p $@
- $(hide) ln -sf /vendor/etc/wifi/qca6750/WCNSS_qcom_cfg.ini $@/WCNSS_qcom_cfg.ini
-
-ALL_DEFAULT_INSTALLED_MODULES += $(WIFI_FIRMWARE_SYMLINKS)
endif
diff --git a/device.mk b/device.mk
index 2d67e73..39960e8 100644
--- a/device.mk
+++ b/device.mk
@@ -467,6 +467,10 @@
frameworks/native/data/etc/android.hardware.wifi.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.xml \
frameworks/native/data/etc/android.software.ipsec_tunnels.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.ipsec_tunnels.xml
+# WiFi firmware symlink
+PRODUCT_PACKAGES += \
+ firmware_WCNSS_qcom_cfg.ini_symlink
+
# WiFi Display
PRODUCT_PACKAGES += \
android.media.audio.common.types-V2-cpp \