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

The last bit that was preventing building hermetic images.

Change-Id: I75bb7de4593a7992f6015317cf97e088beeba0cb
---
 Android.bp | 19 +++++++++++++++++++
 Android.mk |  9 ---------
 common.mk  |  5 +++++
 3 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/Android.bp b/Android.bp
index b5ebdf27..53685d67 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,3 +1,8 @@
+//
+// Copyright (C) 2021-2024 The LineageOS Project
+// SPDX-License-Identifier: Apache-2.0
+//
+
 soong_namespace {
 }
 
@@ -23,3 +28,17 @@ prebuilt_hidl_interfaces {
         "com.qualcomm.qti.dpm.api@1.0::IdpmQmi",
     ],
 }
+
+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 682d3533..e4d2598d 100644
--- a/Android.mk
+++ b/Android.mk
@@ -11,13 +11,4 @@ include $(call all-makefiles-under,$(LOCAL_PATH))
 
 include $(CLEAR_VARS)
 
-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)
-
 endif
diff --git a/common.mk b/common.mk
index 8a0d1820..37c90f2b 100644
--- a/common.mk
+++ b/common.mk
@@ -424,6 +424,11 @@ PRODUCT_COPY_FILES += \
 PRODUCT_SYSTEM_EXT_PROPERTIES += \
     config.disable_rtt=true
 
+# WiFi firmware symlinks
+PRODUCT_PACKAGES += \
+    firmware_wlan_mac.bin_symlink \
+    firmware_WCNSS_qcom_cfg.ini_symlink
+
 # WiFi Display
 PRODUCT_PACKAGES += \
     libwfdaac_vendor