From 92cbc32b089ac7b5b67e267f59ac559ffdeb473f Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Fri, 8 Mar 2024 16:59:21 +0200 Subject: [PATCH] sunfish: Switch to barbet Wi-Fi service Change-Id: Ia55f403319252cea93e8bc3786173c5f8d66fb37 --- device-lineage.mk | 8 ++------ device_framework_matrix_product.xml | 5 ++--- proprietary-files-vendor.txt | 7 ------- proprietary-files.txt | 9 +++++++++ regen-vendor.sh | 9 +++++++++ 5 files changed, 22 insertions(+), 16 deletions(-) diff --git a/device-lineage.mk b/device-lineage.mk index ee3de159..adb36476 100644 --- a/device-lineage.mk +++ b/device-lineage.mk @@ -144,6 +144,8 @@ PRODUCT_PACKAGES += \ # Wi-Fi PRODUCT_PACKAGES += \ + android.hardware.wifi-V2-ndk.vendor:64 \ + android.hardware.wifi@1.0.vendor:64 \ libwifi-hal:64 \ libwifi-hal-ctrl:64 \ libwifi-hal-qcom @@ -189,12 +191,6 @@ PRODUCT_PACKAGES += \ android.hardware.sensors@2.1.vendor \ android.hardware.thermal@2.0.vendor:64 \ android.hardware.weaver@1.0.vendor:64 \ - android.hardware.wifi@1.1.vendor:64 \ - android.hardware.wifi@1.2.vendor:64 \ - android.hardware.wifi@1.3.vendor:64 \ - android.hardware.wifi@1.4.vendor:64 \ - android.hardware.wifi@1.5.vendor:64 \ - android.hardware.wifi@1.6.vendor:64 \ android.system.net.netd@1.1.vendor:64 # Properties diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml index 16cecd72..9df1adea 100644 --- a/device_framework_matrix_product.xml +++ b/device_framework_matrix_product.xml @@ -220,10 +220,9 @@ default - + vendor.google.wifi_ext - hwbinder - 1.3 + 1-3 IWifiExt default diff --git a/proprietary-files-vendor.txt b/proprietary-files-vendor.txt index 353e1e3d..deb6c09b 100644 --- a/proprietary-files-vendor.txt +++ b/proprietary-files-vendor.txt @@ -37,7 +37,6 @@ vendor/bin/hw/init_citadel vendor/bin/hw/qcrild vendor/bin/hw/vendor.google.google_battery-service vendor/bin/hw/vendor.google.radioext@1.0-service -vendor/bin/hw/vendor.google.wifi_ext@1.0-service-vendor vendor/bin/hw/vendor.qti.hardware.qseecom@1.0-service vendor/bin/hw/vendor.qti.hardware.qteeconnector@1.0-service vendor/bin/hw/vendor.qti.hardware.tui_comm@1.0-service-qti @@ -266,7 +265,6 @@ vendor/etc/init/rebootescrow-citadel.rc vendor/etc/init/ssgtzd.rc vendor/etc/init/vendor.google.google_battery-default.rc vendor/etc/init/vendor.google.radioext@1.0-service.rc -vendor/etc/init/vendor.google.wifi_ext@1.0-service.rc vendor/etc/init/vendor.qti.adsprpc-sscrpc-service.rc vendor/etc/init/vendor.qti.cdsprpc-service.rc vendor/etc/init/vendor.qti.hardware.charger_monitor@1.0-service.rc @@ -356,7 +354,6 @@ vendor/etc/vintf/manifest/android.hardware.neuralnetworks@1.3-service-qti.xml vendor/etc/vintf/manifest/android.hardware.weaver@1.0-service.citadel.xml vendor/etc/vintf/manifest/manifest_android.hardware.drm-service.widevine.xml vendor/etc/vintf/manifest/manifest_input.processor-service.xml -vendor/etc/vintf/manifest/manifest_wifi_ext.xml vendor/etc/vintf/manifest/rebootescrow-citadel.xml vendor/etc/vintf/manifest/vendor.google.google_battery-default.xml vendor/etc/xtra_root_cert.pem @@ -987,7 +984,6 @@ vendor/lib64/egl/libQTapGLES.so vendor/lib64/egl/libq3dtools_adreno.so vendor/lib64/egl/libq3dtools_esx.so vendor/lib64/g3a.data.manager.vendor.so -vendor/lib64/google_wifi_firmware_config_info_cc_proto.so vendor/lib64/hw/android.hardware.bluetooth@1.0-impl-qti.so vendor/lib64/hw/android.hardware.gatekeeper@1.0-impl-qti.so vendor/lib64/hw/android.hardware.keymaster@3.0-impl-qti.so @@ -1315,9 +1311,6 @@ vendor/lib64/vendor.google.radioext@1.1.so vendor/lib64/vendor.google.radioext@1.2.so vendor/lib64/vendor.google.radioext@1.3.so vendor/lib64/vendor.google.wifi_ext@1.0.so -vendor/lib64/vendor.google.wifi_ext@1.1.so -vendor/lib64/vendor.google.wifi_ext@1.2.so -vendor/lib64/vendor.google.wifi_ext@1.3.so vendor/lib64/vendor.qti.data.factory@2.0.so vendor/lib64/vendor.qti.data.factory@2.1.so vendor/lib64/vendor.qti.data.factory@2.2.so diff --git a/proprietary-files.txt b/proprietary-files.txt index cdae9598..0ccf6cfc 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -151,3 +151,12 @@ system_ext/etc/permissions/vzw_mvs_permissions.xml system_ext/priv-app/MyVerizonServices/MyVerizonServices.apk;PRESIGNED system_ext/priv-app/OBDM_Permissions/OBDM_Permissions.apk;PRESIGNED system_ext/priv-app/obdm_stub/obdm_stub.apk;PRESIGNED + +# vendor partition + +# Wi-Fi service +vendor/bin/hw/vendor.google.wifi_ext-service-vendor|1edcbf349a1fcf471f726bcbb5eb31a2e6db89fa +vendor/etc/init/vendor.google.wifi_ext-service.rc|8565ca57da131819441d6fb87abfcae134ed2ef9 +vendor/etc/vintf/manifest/manifest_wifi_ext_aidl.xml|6c411f5a63ebc252698fc880d8813ca8c9c63d9c +vendor/lib64/google_wifi_firmware_config_info_cc_proto.so|d40e09d8c4640f28efdd659e49e8ee6a727ef4a2 +vendor/lib64/vendor.google.wifi_ext-V3-ndk.so|d199582834b5b266426ae8dac5692cd1bb2b9552 diff --git a/regen-vendor.sh b/regen-vendor.sh index 735c0616..bc8cbfad 100755 --- a/regen-vendor.sh +++ b/regen-vendor.sh @@ -1089,6 +1089,15 @@ VENDOR_SKIP_FILES=( "lib64/libwifi-hal-ctrl.so" "lib64/libwifi-hal-qcom.so" + # Wi-Fi service + "bin/hw/vendor.google.wifi_ext@1.0-service-vendor" + "etc/init/vendor.google.wifi_ext@1.0-service.rc" + "etc/vintf/manifest/manifest_wifi_ext.xml" + "lib64/google_wifi_firmware_config_info_cc_proto.so" + "lib64/vendor.google.wifi_ext@1.1.so" + "lib64/vendor.google.wifi_ext@1.2.so" + "lib64/vendor.google.wifi_ext@1.3.so" + # Misc interfaces "lib/android.frameworks.sensorservice@1.0.so" "lib/android.hardware.authsecret@1.0.so"