rosemary: Rename libwifi-hal.so

* To prevent conflict with aosp's

Change-Id: I922f26c45957f4bc5d2ad85e14ecfcb382abf811
This commit is contained in:
SamarV-121
2022-09-17 14:45:43 +01:00
committed by Matsvei Niaverau
parent 1f7119eeec
commit f5f10bc632
6 changed files with 85 additions and 2 deletions

View File

@@ -334,7 +334,7 @@ PRODUCT_PACKAGES += \
android.hardware.wifi.hostapd@1.2.vendor
PRODUCT_PACKAGES += \
android.hardware.wifi@1.0-service-lazy
android.hardware.wifi@1.0-service-lazy.rosemary
PRODUCT_PACKAGES += \
libkeystore-wifi-hidl \

View File

@@ -58,6 +58,9 @@ function blob_fixup {
vendor/lib*/hw/audio.primary.mt6785.so)
"${PATCHELF}" --add-needed "libshim_audio.so" "${2}"
;;
vendor/lib64/libwifi-hal-mtk.so)
"$PATCHELF" --set-soname libwifi-hal-mtk.so "${2}"
;;
vendor/bin/hw/android.hardware.keymaster@4.0-service.beanpod)
"${PATCHELF}" --add-needed "libshim_beanpod.so" "${2}"
;;

View File

@@ -2658,7 +2658,7 @@ vendor/etc/init/init.wmt_drv.rc
vendor/etc/init/wlan_assistant.rc
-vendor/etc/vintf/manifest/manifest.xml:vendor/etc/vintf/manifest/wpa_supplicant.xml
-vendor/etc/vintf/manifest/android.hardware.wifi.hostapd.xml
vendor/lib64/libwifi-hal.so
-vendor/lib64/libwifi-hal.so:vendor/lib64/libwifi-hal-mtk.so
vendor/lib64/libwifitest.so
vendor/lib64/vendor.mediatek.hardware.wifi.supplicant@2.0.so
vendor/lib64/vendor.mediatek.hardware.wifi.supplicant@2.1.so

56
wifi/Android.mk Normal file
View File

@@ -0,0 +1,56 @@
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_MODULE := android.hardware.wifi@1.0-service-lazy.rosemary.rc
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_CLASS := ETC
LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_ETC)/init
LOCAL_SRC_FILES := $(LOCAL_MODULE)
include $(BUILD_PREBUILT)
include $(CLEAR_VARS)
LOCAL_MODULE := android.hardware.wifi@1.0-service.rosemary.xml
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_CLASS := ETC
LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_ETC)/vintf/manifest
LOCAL_SRC_FILES := $(LOCAL_MODULE)
include $(BUILD_PREBUILT)
LOCAL_PATH := hardware/interfaces/wifi/1.5/default
include $(CLEAR_VARS)
LOCAL_MODULE := android.hardware.wifi@1.0-service-lazy.rosemary
LOCAL_MODULE_RELATIVE_PATH := hw
LOCAL_PROPRIETARY_MODULE := true
LOCAL_CPPFLAGS := -Wall -Werror -Wextra
LOCAL_CFLAGS := -DLAZY_SERVICE
LOCAL_C_INCLUDES := frameworks/opt/net/wifi/libwifi_hal/include
LOCAL_HEADER_LIBRARIES := libhardware_legacy_headers
LOCAL_REQUIRED_MODULES := \
android.hardware.wifi@1.0-service-lazy.rosemary.rc \
android.hardware.wifi@1.0-service.rosemary.xml
LOCAL_SRC_FILES := \
service.cpp
LOCAL_SHARED_LIBRARIES := \
libbase \
libcutils \
libhidlbase \
liblog \
libnl \
libutils \
libwifi-hal-mtk \
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
LOCAL_STATIC_LIBRARIES := android.hardware.wifi@1.0-service-lib
include $(BUILD_EXECUTABLE)

View File

@@ -0,0 +1,13 @@
service vendor.wifi_hal_legacy /vendor/bin/hw/android.hardware.wifi@1.0-service-lazy.rosemary
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
oneshot
disabled
class hal
capabilities NET_ADMIN NET_RAW SYS_MODULE
user wifi
group wifi gps

View File

@@ -0,0 +1,11 @@
<manifest version="1.0" type="device">
<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>