From 689e6af2a249361cb98f208991438c786c66946f Mon Sep 17 00:00:00 2001
From: bgcngm <bgcngm@users.noreply.github.com>
Date: Thu, 1 Aug 2024 06:50:02 +0200
Subject: [PATCH] stone: Convert WiFi firmware symlinks to install_symlink
 targets

The last bit that was preventing building hermetic images.

Signed-off-by: Arijit78 <sahaarijit2007@gmail.com>
---
 Android.bp | 14 ++++++++++++++
 Android.mk |  9 ---------
 device.mk  |  5 +++++
 3 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/Android.bp b/Android.bp
index 2722586..527cce1 100644
--- a/Android.bp
+++ b/Android.bp
@@ -4,3 +4,17 @@ soong_namespace {
         "hardware/xiaomi",
     ],
 }
+
+install_symlink {
+    name: "firmware_wlan_mac.bin_symlink",
+    vendor: true,
+    installed_location: "firmware/wlan/qca_cld/wlan_mac.bin",
+    symlink_target: "/mnt/vendor/persist/wlan_mac.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/WCNSS_qcom_cfg.ini",
+}
diff --git a/Android.mk b/Android.mk
index 2dcc7d0..9c569e9 100644
--- a/Android.mk
+++ b/Android.mk
@@ -46,15 +46,6 @@ ALL_DEFAULT_INSTALLED_MODULES += $(BT_FIRMWARE_MOUNT_POINT)
 ALL_DEFAULT_INSTALLED_MODULES += $(DSP_MOUNT_POINT)
 ALL_DEFAULT_INSTALLED_MODULES += $(VM_SYSTEM_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/WCNSS_qcom_cfg.ini $@/WCNSS_qcom_cfg.ini
-	$(hide) ln -sf /mnt/vendor/persist/wlan_mac.bin $@/wlan_mac.bin
-
-ALL_DEFAULT_INSTALLED_MODULES += $(WIFI_FIRMWARE_SYMLINKS)
-
 # Symlinks
 EGL_LIBRARIES := \
 	libEGL_adreno.so \
diff --git a/device.mk b/device.mk
index 984b2f2..e1a69d9 100644
--- a/device.mk
+++ b/device.mk
@@ -614,5 +614,10 @@ PRODUCT_PACKAGES += \
 PRODUCT_COPY_FILES += \
     $(call find-copy-subdir-files,*,$(LOCAL_PATH)/wifi/,$(TARGET_COPY_OUT_VENDOR)/etc/wifi)
 
+# WiFi firmware symlinks
+PRODUCT_PACKAGES += \
+    firmware_wlan_mac.bin_symlink \
+    firmware_WCNSS_qcom_cfg.ini_symlink
+
 # Inherit the proprietary files
 $(call inherit-product, vendor/xiaomi/stone/stone-vendor.mk)