From d159cb9039016de75120256c6fd9511345f4e9f8 Mon Sep 17 00:00:00 2001
From: David Wronek <david@mainlining.org>
Date: Sun, 15 Dec 2024 11:51:22 +0100
Subject: [PATCH] e3q: Fix Wi-Fi

Change-Id: I35948d9af8ec603c794eb289f40a3327a3deb913
---
 Android.bp            |  2 +-
 BoardConfig.mk        |  1 +
 proprietary-files.txt | 17 +++++++++++++++++
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/Android.bp b/Android.bp
index 3d935f8..0cae05b 100644
--- a/Android.bp
+++ b/Android.bp
@@ -25,5 +25,5 @@ install_symlink {
     name: "firmware_WCNSS_qcom_cfg.ini_symlink",
     vendor: true,
     installed_location: "firmware/wlan/qca_cld/kiwi_v2/WCNSS_qcom_cfg.ini",
-    symlink_target: "/odm/vendor/etc/wifi/WCNSS_qcom_cfg.ini",
+    symlink_target: "/vendor/etc/wifi/kiwi_v2/WCNSS_qcom_cfg.ini",
 }
diff --git a/BoardConfig.mk b/BoardConfig.mk
index 797363f..7c538a7 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -272,6 +272,7 @@ BOARD_WPA_SUPPLICANT_DRIVER := $(BOARD_HOSTAPD_DRIVER)
 BOARD_WPA_SUPPLICANT_PRIVATE_LIB := $(BOARD_HOSTAPD_PRIVATE_LIB)
 BOARD_WPA_SUPPLICANT_PRIVATE_LIB_EVENT := "ON"
 CONFIG_IEEE80211AX := true
+WIFI_DRIVER_DEFAULT := qca_cld3
 WIFI_DRIVER_STATE_CTRL_PARAM := "/dev/wlan"
 WIFI_DRIVER_STATE_OFF := "OFF"
 WIFI_DRIVER_STATE_ON := "ON"
diff --git a/proprietary-files.txt b/proprietary-files.txt
index 4438150..f3eb64e 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -42,6 +42,7 @@ vendor/lib64/libsecaudiolevel.so
 vendor/lib64/libsecnativefeature.so
 vendor/lib64/libspeakercalibration.so
 vendor/lib64/libtensorflowlite_c.so
+vendor/lib64/libvui_dmgr_client.so
 vendor/lib64/libvui_intf.so
 vendor/lib64/vendor.qti.hardware.AGMIPC@1.0-impl.so
 vendor/lib64/vendor.qti.hardware.ListenSoundModel@1.0-impl.so
@@ -252,6 +253,7 @@ vendor/lib64/libhdrdynamicootf.so
 vendor/lib64/libintervmipc.so
 vendor/lib64/liblearningmodule.so
 vendor/lib64/libmemutils.so
+vendor/lib64/libmeters.so
 vendor/lib64/libmm-hdcpmgr.so
 vendor/lib64/libops.so
 vendor/lib64/libqdcm-algo.so
@@ -779,3 +781,18 @@ vendor/lib64/libtime_genoff.so
 
 # USB
 vendor/bin/hw/android.hardware.usb-service.qti
+
+# Wi-Fi
+vendor/bin/cnss-daemon
+vendor/bin/cnss_diag;DISABLE_DEPS
+vendor/etc/hostapd/hostapd.accept
+vendor/etc/hostapd/hostapd.deny
+vendor/etc/hostapd/hostapd_default.conf
+vendor/etc/init/init.vendor.wlan.rc
+vendor/etc/init/wifi.rc
+vendor/etc/init/wifi_qcom.rc
+vendor/etc/wifi/indoorchannel.info
+vendor/etc/wifi/kiwi_v2/WCNSS_qcom_cfg.ini
+vendor/etc/wifi/p2p_supplicant_overlay.conf
+vendor/etc/wifi/wpa_supplicant.conf
+vendor/etc/wifi/wpa_supplicant_overlay.conf