diff --git a/Android.bp b/Android.bp index f290a28..b0b39a2 100644 --- a/Android.bp +++ b/Android.bp @@ -146,24 +146,6 @@ prebuilt_etc_xml { soc_specific: true, } -prebuilt_etc_xml { - name: "android.hardware.wifi.hostapd", - owner: "xiaomi", - src: "proprietary/vendor/etc/vintf/manifest/android.hardware.wifi.hostapd.xml", - filename_from_src: true, - sub_dir: "vintf/manifest", - soc_specific: true, -} - -prebuilt_etc_xml { - name: "android.hardware.wifi.supplicant", - owner: "xiaomi", - src: "proprietary/vendor/etc/vintf/manifest/android.hardware.wifi.supplicant.xml", - filename_from_src: true, - sub_dir: "vintf/manifest", - soc_specific: true, -} - prebuilt_etc_xml { name: "gnss-mtk", owner: "xiaomi", diff --git a/proprietary/vendor/bin/hw/hostapd b/proprietary/vendor/bin/hw/hostapd deleted file mode 100644 index 441e0cb..0000000 Binary files a/proprietary/vendor/bin/hw/hostapd and /dev/null differ diff --git a/proprietary/vendor/bin/hw/wpa_supplicant b/proprietary/vendor/bin/hw/wpa_supplicant deleted file mode 100644 index cc6079f..0000000 Binary files a/proprietary/vendor/bin/hw/wpa_supplicant and /dev/null differ diff --git a/proprietary/vendor/etc/init/android.hardware.wifi.supplicant-service.rc b/proprietary/vendor/etc/init/android.hardware.wifi.supplicant-service.rc deleted file mode 100644 index 71318d4..0000000 --- a/proprietary/vendor/etc/init/android.hardware.wifi.supplicant-service.rc +++ /dev/null @@ -1,16 +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 android.hardware.wifi.supplicant@1.0::ISupplicant default - interface android.hardware.wifi.supplicant@1.1::ISupplicant default - interface android.hardware.wifi.supplicant@1.2::ISupplicant default - interface android.hardware.wifi.supplicant@1.3::ISupplicant default - interface android.hardware.wifi.supplicant@1.4::ISupplicant default - class main - socket wpa_wlan0 dgram 660 wifi wifi - disabled - oneshot diff --git a/proprietary/vendor/etc/init/hostapd.android.rc b/proprietary/vendor/etc/init/hostapd.android.rc deleted file mode 100644 index 7cc45bd..0000000 --- a/proprietary/vendor/etc/init/hostapd.android.rc +++ /dev/null @@ -1,24 +0,0 @@ -# -# init.rc fragment for hostapd on Android -# Copyright (c) 2002-2016, Jouni Malinen -# -# 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 android.hardware.wifi.hostapd@1.0::IHostapd default - interface android.hardware.wifi.hostapd@1.1::IHostapd default - interface android.hardware.wifi.hostapd@1.2::IHostapd default - interface android.hardware.wifi.hostapd@1.3::IHostapd default - class main - capabilities NET_ADMIN NET_RAW - user wifi - group wifi net_raw net_admin - disabled - oneshot diff --git a/proprietary/vendor/etc/vintf/manifest/android.hardware.wifi.hostapd.xml b/proprietary/vendor/etc/vintf/manifest/android.hardware.wifi.hostapd.xml deleted file mode 100644 index c688d3e..0000000 --- a/proprietary/vendor/etc/vintf/manifest/android.hardware.wifi.hostapd.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - android.hardware.wifi.hostapd - hwbinder - 1.3 - - IHostapd - default - - - diff --git a/proprietary/vendor/etc/vintf/manifest/android.hardware.wifi.supplicant.xml b/proprietary/vendor/etc/vintf/manifest/android.hardware.wifi.supplicant.xml deleted file mode 100644 index 772096c..0000000 --- a/proprietary/vendor/etc/vintf/manifest/android.hardware.wifi.supplicant.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - android.hardware.wifi.supplicant - hwbinder - 1.4 - - ISupplicant - default - - - diff --git a/rosemary-vendor.mk b/rosemary-vendor.mk index 3e0084b..c87a0af 100644 --- a/rosemary-vendor.mk +++ b/rosemary-vendor.mk @@ -71,7 +71,6 @@ PRODUCT_COPY_FILES += \ vendor/xiaomi/rosemary/proprietary/vendor/bin/hw/android.hardware.thermal@2.0-service.mtk:$(TARGET_COPY_OUT_VENDOR)/bin/hw/android.hardware.thermal@2.0-service.mtk \ vendor/xiaomi/rosemary/proprietary/vendor/bin/hw/android.hardware.usb@1.2-service-mediatekv2:$(TARGET_COPY_OUT_VENDOR)/bin/hw/android.hardware.usb@1.2-service-mediatekv2 \ vendor/xiaomi/rosemary/proprietary/vendor/bin/hw/camerahalserver:$(TARGET_COPY_OUT_VENDOR)/bin/hw/camerahalserver \ - vendor/xiaomi/rosemary/proprietary/vendor/bin/hw/hostapd:$(TARGET_COPY_OUT_VENDOR)/bin/hw/hostapd \ vendor/xiaomi/rosemary/proprietary/vendor/bin/hw/mtkfusionrild:$(TARGET_COPY_OUT_VENDOR)/bin/hw/mtkfusionrild \ vendor/xiaomi/rosemary/proprietary/vendor/bin/hw/tetheroffloadservice:$(TARGET_COPY_OUT_VENDOR)/bin/hw/tetheroffloadservice \ vendor/xiaomi/rosemary/proprietary/vendor/bin/hw/vendor.mediatek.hardware.keymaster_attestation@1.1-service:$(TARGET_COPY_OUT_VENDOR)/bin/hw/vendor.mediatek.hardware.keymaster_attestation@1.1-service \ @@ -83,7 +82,6 @@ PRODUCT_COPY_FILES += \ vendor/xiaomi/rosemary/proprietary/vendor/bin/hw/vendor.mediatek.hardware.pq@2.2-service:$(TARGET_COPY_OUT_VENDOR)/bin/hw/vendor.mediatek.hardware.pq@2.2-service \ vendor/xiaomi/rosemary/proprietary/vendor/bin/hw/vendor.microtrust.hardware.soter@1.0-service:$(TARGET_COPY_OUT_VENDOR)/bin/hw/vendor.microtrust.hardware.soter@1.0-service \ vendor/xiaomi/rosemary/proprietary/vendor/bin/hw/vtservice_hidl:$(TARGET_COPY_OUT_VENDOR)/bin/hw/vtservice_hidl \ - vendor/xiaomi/rosemary/proprietary/vendor/bin/hw/wpa_supplicant:$(TARGET_COPY_OUT_VENDOR)/bin/hw/wpa_supplicant \ vendor/xiaomi/rosemary/proprietary/vendor/bin/ipsec_mon:$(TARGET_COPY_OUT_VENDOR)/bin/ipsec_mon \ vendor/xiaomi/rosemary/proprietary/vendor/bin/lbs_hidl_service:$(TARGET_COPY_OUT_VENDOR)/bin/lbs_hidl_service \ vendor/xiaomi/rosemary/proprietary/vendor/bin/lc_nvram_prinfo:$(TARGET_COPY_OUT_VENDOR)/bin/lc_nvram_prinfo \ @@ -324,7 +322,6 @@ PRODUCT_COPY_FILES += \ vendor/xiaomi/rosemary/proprietary/vendor/etc/init/android.hardware.secure_element@1.2-service-mediatek.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.secure_element@1.2-service-mediatek.rc \ vendor/xiaomi/rosemary/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/xiaomi/rosemary/proprietary/vendor/etc/init/android.hardware.usb@1.2-service-mediatekv2.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.usb@1.2-service-mediatekv2.rc \ - vendor/xiaomi/rosemary/proprietary/vendor/etc/init/android.hardware.wifi.supplicant-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.wifi.supplicant-service.rc \ vendor/xiaomi/rosemary/proprietary/vendor/etc/init/atcid.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/atcid.rc \ vendor/xiaomi/rosemary/proprietary/vendor/etc/init/audiocmdservice_atci.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/audiocmdservice_atci.rc \ vendor/xiaomi/rosemary/proprietary/vendor/etc/init/bootperf.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/bootperf.rc \ @@ -335,7 +332,6 @@ PRODUCT_COPY_FILES += \ vendor/xiaomi/rosemary/proprietary/vendor/etc/init/fuelgauged_init.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/fuelgauged_init.rc \ vendor/xiaomi/rosemary/proprietary/vendor/etc/init/fuelgauged_nvram_init.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/fuelgauged_nvram_init.rc \ vendor/xiaomi/rosemary/proprietary/vendor/etc/init/gsm0710muxd.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/gsm0710muxd.rc \ - vendor/xiaomi/rosemary/proprietary/vendor/etc/init/hostapd.android.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hostapd.android.rc \ vendor/xiaomi/rosemary/proprietary/vendor/etc/init/init.bip.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.bip.rc \ vendor/xiaomi/rosemary/proprietary/vendor/etc/init/init.cccimdinit.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.cccimdinit.rc \ vendor/xiaomi/rosemary/proprietary/vendor/etc/init/init.cccirpcd.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.cccirpcd.rc \ @@ -2573,8 +2569,6 @@ PRODUCT_PACKAGES += \ com.android.hotwordenrollment.common.util \ android.hardware.neuralnetworks@1.3-service-mtk-dsp-gpu \ android.hardware.usb@1.2-service-mediatekv2 \ - android.hardware.wifi.hostapd \ - android.hardware.wifi.supplicant \ gnss-mtk \ gnss@2.1-service-mtk \ lbs_hidl_service@1.0 \