Evolution-X-Devices/vendor_google_bonito
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bonito: Switch to barbet Wi-Fi service

Browse Source 
Change-Id: If0a59dc321f4d6230516f921c2b1eaf27e808de0
This commit is contained in:
Michael Bestas
2024-03-20 22:38:53 +02:00
parent 44006c4595
commit 8c6089f5ad
11 changed files with 33 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Android.bp
View File

@@ -615,6 +615,15 @@ dex_import {
system_ext_specific: true,
}
prebuilt_etc_xml {
name: "manifest_wifi_ext_aidl",
owner: "google",
src: "proprietary/vendor/etc/vintf/manifest/manifest_wifi_ext_aidl.xml",
filename_from_src: true,
sub_dir: "vintf/manifest",
soc_specific: true,
}
cc_prebuilt_library_shared {
name: "libMpeg4SwEncoder",
owner: "google",
@@ -738,15 +747,6 @@ prebuilt_etc_xml {
soc_specific: true,
}
prebuilt_etc_xml {
name: "manifest_wifi_ext",
owner: "google",
src: "proprietary/vendor/etc/vintf/manifest/manifest_wifi_ext.xml",
filename_from_src: true,
sub_dir: "vintf/manifest",
soc_specific: true,
}
prebuilt_etc_xml {
name: "rebootescrow-citadel",
owner: "google",

15
bonito-vendor.mk
View File

@@ -64,7 +64,11 @@ PRODUCT_COPY_FILES += \
vendor/google/bonito/proprietary/system_ext/lib64/vendor.qti.hardware.tui_comm@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.hardware.tui_comm@1.0.so \
vendor/google/bonito/proprietary/system_ext/lib64/vendor.qti.imsrtpservice@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.imsrtpservice@1.0.so \
vendor/google/bonito/proprietary/system_ext/priv-app/EuiccSupportPixel/esim-full-v0.img:$(TARGET_COPY_OUT_SYSTEM_EXT)/priv-app/EuiccSupportPixel/esim-full-v0.img \
vendor/google/bonito/proprietary/system_ext/priv-app/EuiccSupportPixel/esim-v1.img:$(TARGET_COPY_OUT_SYSTEM_EXT)/priv-app/EuiccSupportPixel/esim-v1.img
vendor/google/bonito/proprietary/system_ext/priv-app/EuiccSupportPixel/esim-v1.img:$(TARGET_COPY_OUT_SYSTEM_EXT)/priv-app/EuiccSupportPixel/esim-v1.img \
vendor/google/bonito/proprietary/vendor/bin/hw/vendor.google.wifi_ext-service-vendor:$(TARGET_COPY_OUT_VENDOR)/bin/hw/vendor.google.wifi_ext-service-vendor \
vendor/google/bonito/proprietary/vendor/etc/init/vendor.google.wifi_ext-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.google.wifi_ext-service.rc \
vendor/google/bonito/proprietary/vendor/lib64/google_wifi_firmware_config_info_cc_proto.so:$(TARGET_COPY_OUT_VENDOR)/lib64/google_wifi_firmware_config_info_cc_proto.so \
vendor/google/bonito/proprietary/vendor/lib64/vendor.google.wifi_ext-V3-ndk.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.google.wifi_ext-V3-ndk.so
PRODUCT_PACKAGES += \
MobileFeliCaClient \
@@ -119,7 +123,8 @@ PRODUCT_PACKAGES += \
com.android.hotwordenrollment.common.util \
com.google.android.camera.extensions \
google-ril \
qcrilhook
qcrilhook \
manifest_wifi_ext_aidl
PRODUCT_COPY_FILES += \
vendor/google/bonito/proprietary/product/etc/CarrierSettings/a1_at.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/a1_at.pb \
vendor/google/bonito/proprietary/product/etc/CarrierSettings/ahamo_jp.pb:$(TARGET_COPY_OUT_PRODUCT)/etc/CarrierSettings/ahamo_jp.pb \
@@ -288,7 +293,6 @@ PRODUCT_COPY_FILES += \
vendor/google/bonito/proprietary/vendor/bin/hw/init_citadel:$(TARGET_COPY_OUT_VENDOR)/bin/hw/init_citadel \
vendor/google/bonito/proprietary/vendor/bin/hw/qcrild:$(TARGET_COPY_OUT_VENDOR)/bin/hw/qcrild \
vendor/google/bonito/proprietary/vendor/bin/hw/vendor.google.radioext@1.0-service:$(TARGET_COPY_OUT_VENDOR)/bin/hw/vendor.google.radioext@1.0-service \
vendor/google/bonito/proprietary/vendor/bin/hw/vendor.google.wifi_ext@1.0-service-vendor:$(TARGET_COPY_OUT_VENDOR)/bin/hw/vendor.google.wifi_ext@1.0-service-vendor \
vendor/google/bonito/proprietary/vendor/bin/hw/vendor.qti.hardware.tui_comm@1.0-service-qti:$(TARGET_COPY_OUT_VENDOR)/bin/hw/vendor.qti.hardware.tui_comm@1.0-service-qti \
vendor/google/bonito/proprietary/vendor/bin/hw/vendor.qti.media.c2@1.0-service:$(TARGET_COPY_OUT_VENDOR)/bin/hw/vendor.qti.media.c2@1.0-service \
vendor/google/bonito/proprietary/vendor/bin/ims_rtp_daemon:$(TARGET_COPY_OUT_VENDOR)/bin/ims_rtp_daemon \
@@ -442,7 +446,6 @@ PRODUCT_COPY_FILES += \
vendor/google/bonito/proprietary/vendor/etc/init/qcrild.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/qcrild.rc \
vendor/google/bonito/proprietary/vendor/etc/init/rebootescrow-citadel.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/rebootescrow-citadel.rc \
vendor/google/bonito/proprietary/vendor/etc/init/vendor.google.radioext@1.0-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.google.radioext@1.0-service.rc \
vendor/google/bonito/proprietary/vendor/etc/init/vendor.google.wifi_ext@1.0-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.google.wifi_ext@1.0-service.rc \
vendor/google/bonito/proprietary/vendor/etc/init/vendor.qti.hardware.tui_comm@1.0-service-qti.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.qti.hardware.tui_comm@1.0-service-qti.rc \
vendor/google/bonito/proprietary/vendor/etc/init/vendor.qti.media.c2@1.0-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.qti.media.c2@1.0-service.rc \
vendor/google/bonito/proprietary/vendor/etc/init/vendor.sensors.qti.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.sensors.qti.rc \
@@ -1000,7 +1003,6 @@ PRODUCT_COPY_FILES += \
vendor/google/bonito/proprietary/vendor/lib64/egl/libQTapGLES.so:$(TARGET_COPY_OUT_VENDOR)/lib64/egl/libQTapGLES.so \
vendor/google/bonito/proprietary/vendor/lib64/egl/libq3dtools_adreno.so:$(TARGET_COPY_OUT_VENDOR)/lib64/egl/libq3dtools_adreno.so \
vendor/google/bonito/proprietary/vendor/lib64/egl/libq3dtools_esx.so:$(TARGET_COPY_OUT_VENDOR)/lib64/egl/libq3dtools_esx.so \
vendor/google/bonito/proprietary/vendor/lib64/google_wifi_firmware_config_info_cc_proto.so:$(TARGET_COPY_OUT_VENDOR)/lib64/google_wifi_firmware_config_info_cc_proto.so \
vendor/google/bonito/proprietary/vendor/lib64/hw/android.hardware.bluetooth@1.0-impl-qti.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/android.hardware.bluetooth@1.0-impl-qti.so \
vendor/google/bonito/proprietary/vendor/lib64/hw/android.hardware.gatekeeper@1.0-impl-qti.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/android.hardware.gatekeeper@1.0-impl-qti.so \
vendor/google/bonito/proprietary/vendor/lib64/hw/camera.sdm710.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/camera.sdm710.so \
@@ -1217,8 +1219,6 @@ PRODUCT_COPY_FILES += \
vendor/google/bonito/proprietary/vendor/lib64/vendor.google.radioext@1.2.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.google.radioext@1.2.so \
vendor/google/bonito/proprietary/vendor/lib64/vendor.google.radioext@1.3.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.google.radioext@1.3.so \
vendor/google/bonito/proprietary/vendor/lib64/vendor.google.wifi_ext@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.google.wifi_ext@1.0.so \
vendor/google/bonito/proprietary/vendor/lib64/vendor.google.wifi_ext@1.1.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.google.wifi_ext@1.1.so \
vendor/google/bonito/proprietary/vendor/lib64/vendor.google.wifi_ext@1.2.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.google.wifi_ext@1.2.so \
vendor/google/bonito/proprietary/vendor/lib64/vendor.google_paintbox@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.google_paintbox@1.0.so \
vendor/google/bonito/proprietary/vendor/lib64/vendor.qti.googleext.imsext@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.googleext.imsext@1.0.so \
vendor/google/bonito/proprietary/vendor/lib64/vendor.qti.hardware.cvp@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.cvp@1.0.so \
@@ -1468,5 +1468,4 @@ PRODUCT_PACKAGES += \
android.hardware.keymaster@4.1-service.citadel \
android.hardware.weaver@1.0-service.citadel \
manifest_android.hardware.drm@1.4-service.widevine \
manifest_wifi_ext \
rebootescrow-citadel

BIN
proprietary/vendor/bin/hw/vendor.google.wifi_ext-service-vendor vendored Normal file
View File

Binary file not shown.

BIN
proprietary/vendor/bin/hw/vendor.google.wifi_ext@1.0-service-vendor vendored
View File

Binary file not shown.

3
proprietary/vendor/etc/init/vendor.google.wifi_ext@1.0-service.rc → proprietary/vendor/etc/init/vendor.google.wifi_ext-service.rc vendored
View File

@@ -1,4 +1,5 @@
service vendor.wifi_hal_legacy /vendor/bin/hw/vendor.google.wifi_ext@1.0-service-vendor
service vendor.wifi_hal_legacy /vendor/bin/hw/vendor.google.wifi_ext-service-vendor
interface aidl android.hardware.wifi.IWifi/default
class hal
capabilities NET_ADMIN NET_RAW
user wifi

20
proprietary/vendor/etc/vintf/manifest/manifest_wifi_ext.xml vendored
View File

@@ -1,20 +0,0 @@
<manifest version="1.0" type="device">
<hal format="hidl">
<name>vendor.google.wifi_ext</name>
<transport>hwbinder</transport>
<version>1.2</version>
<interface>
<name>IWifiExt</name>
<instance>default</instance>
</interface>
</hal>
<hal format="hidl">
<name>android.hardware.wifi</name>
<transport>hwbinder</transport>
<version>1.5</version>
<interface>
<name>IWifi</name>
<instance>default</instance>
</interface>
</hal>
</manifest>

15
proprietary/vendor/etc/vintf/manifest/manifest_wifi_ext_aidl.xml vendored Normal file
View File

@@ -0,0 +1,15 @@
<!--
Input:
vendor/google/interfaces/wifi_ext/aidl/default/manifest_wifi_ext_aidl.xml
-->
<manifest version="7.0" type="device">
<hal format="aidl">
<name>android.hardware.wifi</name>
<fqname>IWifi/default</fqname>
</hal>
<hal format="aidl">
<name>vendor.google.wifi_ext</name>
<version>2</version>
<fqname>IWifiExt/default</fqname>
</hal>
</manifest>

BIN
proprietary/vendor/lib64/google_wifi_firmware_config_info_cc_proto.so vendored
View File

Binary file not shown.

BIN
proprietary/vendor/lib64/vendor.google.wifi_ext-V3-ndk.so vendored Normal file
View File

Binary file not shown.

BIN
proprietary/vendor/lib64/vendor.google.wifi_ext@1.1.so vendored
View File

Binary file not shown.

BIN
proprietary/vendor/lib64/vendor.google.wifi_ext@1.2.so vendored
View File

Binary file not shown.