From 8551890ccce41e538ed094e7dc0a04beccb406ff Mon Sep 17 00:00:00 2001 From: bengris32 Date: Mon, 31 Jul 2023 11:29:39 +0100 Subject: [PATCH] X6833B: Switch to prebuilt `libwifi-hal` * Reference: https://github.com/moto-common/android_device_mediatek_common/tree/master/vendor/wlan * Perhaps it will help with the Wi-Fi scanning issues, and intermittent disconnections we're having. Besides, we can't legally use the OSS one anyway. Change-Id: I9bbf289ad88a12bbdc68ab0abdee410678bf1420 Co-authored-by: electimon Signed-off-by: bengris32 Signed-off-by: dodyirawan85 <40514988+dodyirawan85@users.noreply.github.com> --- BoardConfig.mk | 3 --- configs/wifi/vendor_hals/vendor_hals.xml | 5 +++++ device.mk | 1 - proprietary-files.txt | 1 + 4 files changed, 6 insertions(+), 4 deletions(-) create mode 100644 configs/wifi/vendor_hals/vendor_hals.xml diff --git a/BoardConfig.mk b/BoardConfig.mk index eca60ef..e30597b 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -161,12 +161,9 @@ DEVICE_MANIFEST_FILE := $(CONFIGS_PATH)/vintf/manifest.xml DEVICE_MATRIX_FILE := $(CONFIGS_PATH)/vintf/compatibility_matrix.xml # Wi-Fi -BOARD_WLAN_DEVICE := MediaTek WPA_SUPPLICANT_VERSION := VER_0_8_X BOARD_WPA_SUPPLICANT_DRIVER := NL80211 -BOARD_WPA_SUPPLICANT_PRIVATE_LIB := lib_driver_cmd_mt66xx BOARD_HOSTAPD_DRIVER := NL80211 -BOARD_HOSTAPD_PRIVATE_LIB := lib_driver_cmd_mt66xx WIFI_DRIVER_FW_PATH_PARAM := /dev/wmtWifi WIFI_DRIVER_FW_PATH_STA := STA WIFI_DRIVER_FW_PATH_AP := AP diff --git a/configs/wifi/vendor_hals/vendor_hals.xml b/configs/wifi/vendor_hals/vendor_hals.xml new file mode 100644 index 0000000..735bf97 --- /dev/null +++ b/configs/wifi/vendor_hals/vendor_hals.xml @@ -0,0 +1,5 @@ + + + /vendor/lib64/libwifi-hal-mtk.so + 1 + diff --git a/device.mk b/device.mk index 81ea0bc..48c32ab 100644 --- a/device.mk +++ b/device.mk @@ -186,7 +186,6 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/updatable_apex.mk) PRODUCT_PACKAGES += \ wpa_supplicant \ hostapd \ - libwifi-hal-mt66xx \ android.hardware.wifi@1.0-service-lazy PRODUCT_PACKAGES += \ diff --git a/proprietary-files.txt b/proprietary-files.txt index 588622f..6c70cde 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -541,3 +541,4 @@ vendor/lib64/vendor.mediatek.hardware.netdagent@1.0.so vendor/bin/wlan_assistant vendor/etc/init/init.wlan_drv.rc vendor/etc/init/wlan_assistant.rc +vendor/lib64/libwifi-hal.so:vendor/lib64/libwifi-hal-mtk.so