From e26c0df9a98ff20f30cce4a802aa7d3ace1d70ba Mon Sep 17 00:00:00 2001
From: Bruno Martins <bgcngm@gmail.com>
Date: Sun, 23 Jun 2024 21:58:49 +0100
Subject: [PATCH] sm8350-common: Convert WiFi firmware symlinks to
 install_symlink targets

The last bit that was preventing building hermetic images.

Change-Id: I75bb7de4593a7992f6015317cf97e088beeba0cb
---
 Android.bp | 12 ++++++++++++
 Android.mk | 10 +---------
 common.mk  |  4 ++++
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/Android.bp b/Android.bp
index 2722586..1d190dd 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,6 +1,18 @@
+//
+// Copyright (C) 2020-2024 The LineageOS Project
+// SPDX-License-Identifier: Apache-2.0
+//
+
 soong_namespace {
     imports: [
         "hardware/qcom-caf/bootctrl",
         "hardware/xiaomi",
     ],
 }
+
+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 2ebe978..46088eb 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2020-2022 The LineageOS Project
+# Copyright (C) 2020-2024 The LineageOS Project
 #
 # SPDX-License-Identifier: Apache-2.0
 #
@@ -36,12 +36,4 @@ 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
-
-ALL_DEFAULT_INSTALLED_MODULES += $(WIFI_FIRMWARE_SYMLINKS)
-
 endif
diff --git a/common.mk b/common.mk
index a5ff666..3ab8136 100644
--- a/common.mk
+++ b/common.mk
@@ -566,6 +566,10 @@ PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.hardware.wifi.passpoint.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.passpoint.xml \
     frameworks/native/data/etc/android.hardware.wifi.rtt.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.rtt.xml
 
+# WiFi firmware symlinks
+PRODUCT_PACKAGES += \
+    firmware_WCNSS_qcom_cfg.ini_symlink
+
 # WiFi Display
 PRODUCT_PACKAGES += \
     libnl \