sync vendor

This commit is contained in:
Vincent Vidal 2025-08-07 16:08:49 +02:00
parent 2155061586
commit f8d6f9dc87
13 changed files with 3 additions and 278 deletions

View file

@ -17118,7 +17118,7 @@ cc_prebuilt_library_shared {
}
cc_prebuilt_library_shared {
name: "libwifi-hal",
name: "libwifi-hal-mtk",
owner: "brax",
strip: {
none: true,
@ -17126,7 +17126,7 @@ cc_prebuilt_library_shared {
target: {
android_arm64: {
srcs: [
"proprietary/vendor/lib64/libwifi-hal.so",
"proprietary/vendor/lib64/libwifi-hal-mtk.so",
],
shared_libs: [
"libbase",
@ -19854,15 +19854,6 @@ prebuilt_etc_xml {
soc_specific: true,
}
prebuilt_etc_xml {
name: "android.hardware.wifi@1.0-service.xml",
owner: "brax",
src: "proprietary/vendor/etc/vintf/manifest/android.hardware.wifi@1.0-service.xml",
filename_from_src: true,
sub_dir: "vintf/manifest",
soc_specific: true,
}
prebuilt_etc_xml {
name: "gnss-mtk.xml",
owner: "brax",
@ -20078,64 +20069,6 @@ cc_prebuilt_binary {
soc_specific: true,
}
cc_prebuilt_binary {
name: "hostapd_cli_vendor",
stem: "hostapd_cli",
owner: "brax",
target: {
android_arm64: {
srcs: [
"proprietary/vendor/bin/hostapd_cli",
],
shared_libs: [
"libcutils",
"liblog",
"libc++",
"libc",
"libm",
"libdl",
],
},
},
compile_multilib: "64",
strip: {
none: true,
},
prefer: true,
soc_specific: true,
}
cc_prebuilt_binary {
name: "hs20-osu-client_vendor",
stem: "hs20-osu-client",
owner: "brax",
target: {
android_arm64: {
srcs: [
"proprietary/vendor/bin/hs20-osu-client",
],
shared_libs: [
"libcutils",
"libcrypto-v33",
"libssl",
"libxml2",
"libcurl",
"liblog",
"libc++",
"libc",
"libm",
"libdl",
],
},
},
compile_multilib: "64",
strip: {
none: true,
},
prefer: true,
soc_specific: true,
}
cc_prebuilt_binary {
name: "android.hardware.bluetooth@1.1-service-mediatek",
owner: "brax",
@ -20535,47 +20468,6 @@ cc_prebuilt_binary {
soc_specific: true,
}
cc_prebuilt_binary {
name: "android.hardware.wifi@1.0-service-lazy",
owner: "brax",
target: {
android_arm64: {
srcs: [
"proprietary/vendor/bin/hw/android.hardware.wifi@1.0-service-lazy",
],
shared_libs: [
"libbase",
"libcutils",
"libhidlbase",
"liblog",
"libnl",
"libutils",
"libwifi-hal",
"libwifi-system-iface",
"libxml2",
"android.hardware.wifi@1.0",
"android.hardware.wifi@1.1",
"android.hardware.wifi@1.2",
"android.hardware.wifi@1.3",
"android.hardware.wifi@1.4",
"android.hardware.wifi@1.5",
"android.hardware.wifi@1.6",
"libc++",
"libc",
"libm",
"libdl",
],
},
},
compile_multilib: "64",
strip: {
none: true,
},
prefer: true,
relative_install_path: "hw",
soc_specific: true,
}
cc_prebuilt_binary {
name: "camerahalserver",
owner: "brax",
@ -20625,41 +20517,6 @@ cc_prebuilt_binary {
soc_specific: true,
}
cc_prebuilt_binary {
name: "hostapd_vendor",
stem: "hostapd",
owner: "brax",
target: {
android_arm64: {
srcs: [
"proprietary/vendor/bin/hw/hostapd",
],
shared_libs: [
"libcutils",
"liblog",
"libcrypto-v33",
"libssl",
"libnl",
"android.hardware.wifi.hostapd-V1-ndk",
"libbase",
"libutils",
"libbinder_ndk",
"libc++",
"libc",
"libm",
"libdl",
],
},
},
compile_multilib: "64",
strip: {
none: true,
},
prefer: true,
relative_install_path: "hw",
soc_specific: true,
}
cc_prebuilt_binary {
name: "android.hardware.graphics.allocator@4.0-service-mediatek.mt6835",
owner: "brax",
@ -20961,43 +20818,6 @@ cc_prebuilt_binary {
soc_specific: true,
}
cc_prebuilt_binary {
name: "wpa_supplicant_vendor",
stem: "wpa_supplicant",
owner: "brax",
target: {
android_arm64: {
srcs: [
"proprietary/vendor/bin/hw/wpa_supplicant",
],
shared_libs: [
"libcutils",
"liblog",
"libcrypto-v33",
"libssl",
"libkeystore-wifi-hidl",
"libkeystore-engine-wifi-hidl",
"libnl",
"android.hardware.wifi.supplicant-V1-ndk",
"libutils",
"libbase",
"libbinder_ndk",
"libc++",
"libc",
"libm",
"libdl",
],
},
},
compile_multilib: "64",
strip: {
none: true,
},
prefer: true,
relative_install_path: "hw",
soc_specific: true,
}
sh_binary {
name: "init.insmod",
owner: "brax",
@ -21534,33 +21354,6 @@ cc_prebuilt_binary {
soc_specific: true,
}
cc_prebuilt_binary {
name: "wpa_cli_vendor",
stem: "wpa_cli",
owner: "brax",
target: {
android_arm64: {
srcs: [
"proprietary/vendor/bin/wpa_cli",
],
shared_libs: [
"libcutils",
"liblog",
"libc++",
"libc",
"libm",
"libdl",
],
},
},
compile_multilib: "64",
strip: {
none: true,
},
prefer: true,
soc_specific: true,
}
cc_prebuilt_binary {
name: "vtservice",
owner: "brax",

View file

@ -204,14 +204,11 @@ PRODUCT_COPY_FILES += \
vendor/brax/brax3/proprietary/vendor/etc/init/android.hardware.security.keymint@2.0-service.trustonic.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.security.keymint@2.0-service.trustonic.rc \
vendor/brax/brax3/proprietary/vendor/etc/init/android.hardware.thermal@2.0-service.mtk.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.thermal@2.0-service.mtk.rc \
vendor/brax/brax3/proprietary/vendor/etc/init/android.hardware.usb.gadget-service.mediatek.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.usb.gadget-service.mediatek.rc \
vendor/brax/brax3/proprietary/vendor/etc/init/android.hardware.wifi.supplicant-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.wifi.supplicant-service.rc \
vendor/brax/brax3/proprietary/vendor/etc/init/android.hardware.wifi@1.0-service-lazy.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.wifi@1.0-service-lazy.rc \
vendor/brax/brax3/proprietary/vendor/etc/init/bootperf.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/bootperf.rc \
vendor/brax/brax3/proprietary/vendor/etc/init/camerahalserver.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/camerahalserver.rc \
vendor/brax/brax3/proprietary/vendor/etc/init/fuelgauged_init.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/fuelgauged_init.rc \
vendor/brax/brax3/proprietary/vendor/etc/init/fuelgauged_nvram_init.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/fuelgauged_nvram_init.rc \
vendor/brax/brax3/proprietary/vendor/etc/init/gsm0710muxd.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/gsm0710muxd.rc \
vendor/brax/brax3/proprietary/vendor/etc/init/hostapd.android.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hostapd.android.rc \
vendor/brax/brax3/proprietary/vendor/etc/init/init.bt_drv.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.bt_drv.rc \
vendor/brax/brax3/proprietary/vendor/etc/init/init.cccifsd.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.cccifsd.rc \
vendor/brax/brax3/proprietary/vendor/etc/init/init.cccimdinit.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.cccimdinit.rc \
@ -1015,7 +1012,7 @@ PRODUCT_PACKAGES += \
libtrm \
libudf \
libviagpsrpc \
libwifi-hal \
libwifi-hal-mtk \
libwpfa \
libwvaidl \
mtk000_mipi_raw_IdxMgr \
@ -1111,7 +1108,6 @@ PRODUCT_PACKAGES += \
android.hardware.security.secureclock-service.trustonic.xml \
android.hardware.security.sharedsecret-service.trustonic.xml \
android.hardware.usb.gadget-service.mediatek.xml \
android.hardware.wifi@1.0-service.xml \
gnss-mtk.xml \
gnss@2.1-service-mediatek.xml \
manifest_android.hardware.drm-service.widevine.xml \
@ -1123,8 +1119,6 @@ PRODUCT_PACKAGES += \
fuelgauged_nvram \
gps_dump \
gsm0710muxd \
hostapd_cli_vendor \
hs20-osu-client_vendor \
android.hardware.bluetooth@1.1-service-mediatek \
android.hardware.drm-service.widevine \
android.hardware.gnss-service.mediatek \
@ -1136,9 +1130,7 @@ PRODUCT_PACKAGES += \
android.hardware.security.keymint@2.0-service.trustonic \
android.hardware.thermal@2.0-service.mtk \
android.hardware.usb.gadget-service.mediatekv1.1 \
android.hardware.wifi@1.0-service-lazy \
camerahalserver \
hostapd_vendor \
android.hardware.graphics.allocator@4.0-service-mediatek.mt6835 \
mtkfusionrild \
tetheroffloadservice \
@ -1148,7 +1140,6 @@ PRODUCT_PACKAGES += \
vendor.mediatek.hardware.nvram@1.1-service \
vendor.mediatek.hardware.pq_aidl-service \
vtservice_hidl \
wpa_supplicant_vendor \
init.insmod \
ipsec_mon \
mcDriverDaemon \
@ -1167,7 +1158,6 @@ PRODUCT_PACKAGES += \
wlan_assistant \
wmt_launcher \
wmt_loader \
wpa_cli_vendor \
vtservice
PRODUCT_PACKAGES += \

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View file

@ -1,12 +0,0 @@
service wpa_supplicant /vendor/bin/hw/wpa_supplicant \
-O/data/vendor/wifi/wpa/sockets -dd \
-g@android:wpa_wlan0
# we will start as root and wpa_supplicant will switch to user wifi
# after setting up the capabilities required for WEXT
# user wifi
# group wifi inet keystore
interface aidl android.hardware.wifi.supplicant.ISupplicant/default
class main
socket wpa_wlan0 dgram 660 wifi wifi
disabled
oneshot

View file

@ -1,14 +0,0 @@
service vendor.wifi_hal_legacy /vendor/bin/hw/android.hardware.wifi@1.0-service-lazy
interface android.hardware.wifi@1.0::IWifi default
interface android.hardware.wifi@1.1::IWifi default
interface android.hardware.wifi@1.2::IWifi default
interface android.hardware.wifi@1.3::IWifi default
interface android.hardware.wifi@1.4::IWifi default
interface android.hardware.wifi@1.5::IWifi default
interface android.hardware.wifi@1.6::IWifi default
oneshot
disabled
class hal
capabilities NET_ADMIN NET_RAW SYS_MODULE
user wifi
group wifi gps

View file

@ -1,21 +0,0 @@
#
# init.rc fragment for hostapd on Android
# Copyright (c) 2002-2016, Jouni Malinen <j@w1.fi>
#
# This software may be distributed under the terms of the BSD license.
# See README for more details.
#
on post-fs-data
mkdir /data/vendor/wifi 0770 wifi wifi
mkdir /data/vendor/wifi/hostapd 0770 wifi wifi
mkdir /data/vendor/wifi/hostapd/sockets 0770 wifi wifi
service hostapd /vendor/bin/hw/hostapd
interface aidl android.hardware.wifi.hostapd.IHostapd/default
class main
capabilities NET_ADMIN NET_RAW
user wifi
group wifi net_raw net_admin
disabled
oneshot

View file

@ -1,11 +0,0 @@
<manifest version="1.0" type="device">
<hal format="hidl">
<name>android.hardware.wifi</name>
<transport>hwbinder</transport>
<version>1.6</version>
<interface>
<name>IWifi</name>
<instance>default</instance>
</interface>
</hal>
</manifest>