From b954f402f0a3622be5d3e7016bf587ecbcc6f09b Mon Sep 17 00:00:00 2001
From: Bruno Martins <bgcngm@gmail.com>
Date: Sun, 23 Jun 2024 21:58:49 +0100
Subject: [PATCH] sky: Convert WiFi firmware symlink to install_symlink target

The last bit that was preventing building hermetic images.

Change-Id: I75bb7de4593a7992f6015317cf97e088beeba0cb
---
 Android.bp | 13 +++++++++++++
 Android.mk | 11 -----------
 device.mk  |  5 +++++
 3 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/Android.bp b/Android.bp
index 83dbdc5..421039a 100644
--- a/Android.bp
+++ b/Android.bp
@@ -11,3 +11,16 @@ soong_namespace {
         "hardware/xiaomi",
     ],
 }
+
+install_symlink {
+    name: "symlink_wlan_fw_adrastea",
+    installed_location: "firmware/wlan/qca_cld/adrastea/wlan_mac.bin",
+    symlink_target: "/mnt/vendor/persist/adrastea/wlan_mac.bin",
+    vendor: true,
+}
+install_symlink {
+    name: "symlink_wlan_cfg_adrastea",
+    installed_location: "firmware/wlan/qca_cld/adrastea/WCNSS_qcom_cfg.ini",
+    symlink_target: "/vendor/etc/wifi/adrastea/WCNSS_qcom_cfg.ini",
+    vendor: true,
+}
\ No newline at end of file
diff --git a/Android.mk b/Android.mk
index 514e416..eb2ba6f 100644
--- a/Android.mk
+++ b/Android.mk
@@ -105,17 +105,6 @@ ALL_DEFAULT_INSTALLED_MODULES += \
 	$(RFS_MSM_SLPI_SYMLINKS) \
 	$(RFS_MSM_WPSS_SYMLINKS)
 
-WLAN_FIRMWARE_SYMLINKS := $(TARGET_OUT_VENDOR)/firmware/wlan/qca_cld/adrastea/
-$(WLAN_FIRMWARE_SYMLINKS): $(LOCAL_INSTALLED_MODULE)
-	@echo "Creating WLAN firmware symlinks: $@"
-	@rm -rf $@/*
-	@mkdir -p $@
-	$(hide) ln -sf /vendor/etc/wifi/adrastea/WCNSS_qcom_cfg.ini $@/WCNSS_qcom_cfg.ini
-	$(hide) ln -sf /mnt/vendor/persist/adrastea/wlan_mac.bin $@/wlan_mac.bin
-
-ALL_DEFAULT_INSTALLED_MODULES += \
-	$(WLAN_FIRMWARE_SYMLINKS)
-
 IMS_LIBS := libimscamera_jni.so libimsmedia_jni.so
 IMS_SYMLINKS := $(addprefix $(TARGET_OUT_SYSTEM_EXT_APPS_PRIVILEGED)/ims/lib/arm64/,$(notdir $(IMS_LIBS)))
 $(IMS_SYMLINKS): $(LOCAL_INSTALLED_MODULE)
diff --git a/device.mk b/device.mk
index 592d8d7..8c57f10 100644
--- a/device.mk
+++ b/device.mk
@@ -605,6 +605,11 @@ PRODUCT_PACKAGES += \
     wpa_supplicant \
     wpa_supplicant.conf
 
+# WiFi firmware symlinks
+PRODUCT_PACKAGES += \
+    symlink_wlan_cfg_adrastea \
+    symlink_wlan_fw_adrastea
+
 PRODUCT_COPY_FILES += \
     $(DEVICE_PATH)/configs/WCNSS_qcom_cfg.ini:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/adrastea/WCNSS_qcom_cfg.ini