zenfone9: Convert WiFi firmware symlinks to install_symlink targets
The last bit that was preventing building hermetic images.
Change-Id: I75bb7de4593a7992f6015317cf97e088beeba0cb
diff --git a/Android.bp b/Android.bp
index 013e76b..b36f74a 100644
--- a/Android.bp
+++ b/Android.bp
@@ -22,3 +22,17 @@
installed_location: "factory",
symlink_target: "/mnt/vendor/persist",
}
+
+install_symlink {
+ name: "firmware_wlan_mac.bin_symlink",
+ vendor: true,
+ installed_location: "firmware/wlan/qca_cld/qca6490/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/qca6490/WCNSS_qcom_cfg.ini",
+ symlink_target: "/vendor/etc/wifi/WCNSS_qcom_cfg.ini",
+}
diff --git a/Android.mk b/Android.mk
index 7fe10d3..469452b 100755
--- a/Android.mk
+++ b/Android.mk
@@ -62,14 +62,4 @@
ALL_DEFAULT_INSTALLED_MODULES += $(ASUSFW_MOUNT_POINT) $(XROM_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/factory/wlan_mac.bin $@/wlan_mac.bin
- $(hide) ln -sf /vendor/firmware/wlan/qca_cld/qca6490/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 6844da0..96aba00 100755
--- a/device.mk
+++ b/device.mk
@@ -369,3 +369,8 @@
libwpa_client \
wpa_supplicant \
wpa_supplicant.conf
+
+# WiFi firmware symlinks
+PRODUCT_PACKAGES += \
+ firmware_wlan_mac.bin_symlink \
+ firmware_WCNSS_qcom_cfg.ini_symlink