From 4649cac29372ffefbee8e90a26d961f1e3ba9ddc Mon Sep 17 00:00:00 2001 From: Josip Kelecic Date: Sat, 10 Dec 2022 17:38:33 +0100 Subject: [PATCH] sm8550-common: add shim for libhypervintf * Needed by camera, we don't use hyper HAL. Co-authored-by: chaptsand Co-authored-by: pckotzer Change-Id: I823e9286fe2b8ad2320b83cca0e6f59707c30f5b --- extract-files.py | 1 - libshims/Android.bp | 11 ++++++++ libshims/libhypervintf/libhypervintf.cpp | 32 ++++++++++++++++++++++++ proprietary-files.txt | 5 ---- sepolicy/vendor/attributes | 4 --- sepolicy/vendor/file_contexts | 1 - sepolicy/vendor/hal_camera_default.te | 1 - sepolicy/vendor/hal_hyper_default.te | 15 ----------- sepolicy/vendor/hal_power_default.te | 2 -- sepolicy/vendor/hal_thermal_default.te | 1 - sepolicy/vendor/service.te | 1 - sepolicy/vendor/service_contexts | 3 --- vintf/device_framework_matrix.xml | 8 ------ 13 files changed, 43 insertions(+), 42 deletions(-) create mode 100644 libshims/Android.bp create mode 100644 libshims/libhypervintf/libhypervintf.cpp delete mode 100644 sepolicy/vendor/attributes delete mode 100644 sepolicy/vendor/hal_hyper_default.te diff --git a/extract-files.py b/extract-files.py index 7c2656a..1dfff41 100755 --- a/extract-files.py +++ b/extract-files.py @@ -39,7 +39,6 @@ lib_fixups: lib_fixups_user_type = { 'vendor.qti.diaghal@1.0', 'libsecril-client', 'vendor.qti.hardware.fm@1.0', - 'libhyper', ): lib_fixup_vendor_suffix, ( 'libagmclient', diff --git a/libshims/Android.bp b/libshims/Android.bp new file mode 100644 index 0000000..cf490b5 --- /dev/null +++ b/libshims/Android.bp @@ -0,0 +1,11 @@ +// +// Copyright (C) 2024 The LineageOS Project +// +// SPDX-License-Identifier: Apache-2.0 +// + +cc_library_shared { + name: "libhypervintf", + srcs: ["libhypervintf/libhypervintf.cpp"], + vendor: true, +} diff --git a/libshims/libhypervintf/libhypervintf.cpp b/libshims/libhypervintf/libhypervintf.cpp new file mode 100644 index 0000000..68c2d41 --- /dev/null +++ b/libshims/libhypervintf/libhypervintf.cpp @@ -0,0 +1,32 @@ +/* + * Copyright (C) 2024 The LineageOS Project + * + * SPDX-License-Identifier: Apache-2.0 + */ + +#include +#include + +struct HyPerToken { +}; + +void hyper_getNewHyPerToken(void) { +} + +void hyper_setTokenProcName(HyPerToken*, std::string) { +} + +void hyper_checkResourceExist(int) { +} + +void hyper_acquire(HyPerToken, std::vector) { +} + +void hyper_setProcName(std::string) { +} + +void hyper_getSupportedFrequency(int, int) { +} + +void hyper_release(HyPerToken) { +} diff --git a/proprietary-files.txt b/proprietary-files.txt index a19f783..44e0460 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -875,11 +875,6 @@ system_ext/etc/permissions/com.android.hotwordenrollment.common.util.xml system_ext/framework/com.android.hotwordenrollment.common.util.jar # HyPer -vendor/bin/hw/vendor.samsung.hardware.hyper-service -vendor/etc/init/hyper-default-sec.rc -vendor/etc/vintf/manifest/hyper-default-sec.xml -vendor/lib64/libhyper.so;MODULE_SUFFIX=_vendor -vendor/lib64/libhypervintf.so vendor/lib64/vendor.samsung.hardware.hyper-V2-ndk.so # IMS diff --git a/sepolicy/vendor/attributes b/sepolicy/vendor/attributes deleted file mode 100644 index 095037f..0000000 --- a/sepolicy/vendor/attributes +++ /dev/null @@ -1,4 +0,0 @@ -# Hyper -attribute hal_hyper; -attribute hal_hyper_server; -attribute hal_hyper_client; diff --git a/sepolicy/vendor/file_contexts b/sepolicy/vendor/file_contexts index 874f646..f9db15f 100644 --- a/sepolicy/vendor/file_contexts +++ b/sepolicy/vendor/file_contexts @@ -78,7 +78,6 @@ /(vendor|system/vendor)/bin/hw/nxp\.android\.hardware\.nfc@1\.2-service u:object_r:hal_nfc_default_exec:s0 /(vendor|system/vendor)/bin/hw/sehradiomanager u:object_r:sehradiomanager_exec:s0 /(vendor|system/vendor)/bin/hw/vendor\.samsung\.hardware\.camera\.provider-service_64 u:object_r:hal_camera_default_exec:s0 -/(vendor|system/vendor)/bin/hw/vendor\.samsung\.hardware\.hyper-service u:object_r:hal_hyper_default_exec:s0 /(vendor|system/vendor)/bin/hw/vendor\.samsung\.hardware\.thermal@1\.0-service u:object_r:hal_thermal_default_exec:s0 /(vendor|system/vendor)/bin/hw/vendor\.samsung\.hardware\.vibrator-service u:object_r:hal_vibrator_default_exec:s0 /(vendor|system/vendor)/bin/secril_config_svc u:object_r:vendor_secril_config_svc_exec:s0 diff --git a/sepolicy/vendor/hal_camera_default.te b/sepolicy/vendor/hal_camera_default.te index cde53b5..604072f 100644 --- a/sepolicy/vendor/hal_camera_default.te +++ b/sepolicy/vendor/hal_camera_default.te @@ -23,7 +23,6 @@ r_dir_file(hal_camera_default, vendor_sysfs_sensors) # Allow camera HAL to read proc_meminfo allow hal_camera_default proc_meminfo:file r_file_perms; -hal_client_domain(hal_camera_default, hal_hyper) hal_client_domain(hal_camera_default, hal_thermal) get_prop(hal_camera_default, sec_camera_prop) diff --git a/sepolicy/vendor/hal_hyper_default.te b/sepolicy/vendor/hal_hyper_default.te deleted file mode 100644 index 02f60f8..0000000 --- a/sepolicy/vendor/hal_hyper_default.te +++ /dev/null @@ -1,15 +0,0 @@ -type hal_hyper_default, domain; - -hal_server_domain(hal_hyper_default, hal_hyper) - -type hal_hyper_default_exec, exec_type, vendor_file_type, file_type; -init_daemon_domain(hal_hyper_default) - -binder_call(hal_hyper_client, hal_hyper_server) - -add_service(hal_hyper_server, hal_hyper_service) -allow hal_hyper_client hal_hyper_service:service_manager find; - -allow hal_hyper_default servicemanager:binder { call transfer }; - -get_prop(hal_hyper_default, product_ship_prop) diff --git a/sepolicy/vendor/hal_power_default.te b/sepolicy/vendor/hal_power_default.te index 84b341d..cc78514 100644 --- a/sepolicy/vendor/hal_power_default.te +++ b/sepolicy/vendor/hal_power_default.te @@ -15,5 +15,3 @@ allow hal_power_default vendor_sysfs_touchscreen_writable:file rw_file_perms; # Allow power HAL to to read/write vendor_sysfs_battery allow hal_power_default vendor_sysfs_battery:dir r_dir_perms; allow hal_power_default vendor_sysfs_battery:file rw_file_perms; - -hal_client_domain(hal_power_default, hal_hyper) diff --git a/sepolicy/vendor/hal_thermal_default.te b/sepolicy/vendor/hal_thermal_default.te index ed4e42f..c2d66c6 100644 --- a/sepolicy/vendor/hal_thermal_default.te +++ b/sepolicy/vendor/hal_thermal_default.te @@ -12,7 +12,6 @@ allow hal_thermal_default fwk_camera_hwservice:hwservice_manager find; binder_call(hal_thermal_default, cameraserver) hal_client_domain(hal_thermal_default, hal_audio) -hal_client_domain(hal_thermal_default, hal_hyper) unix_socket_connect(hal_thermal_default, property, rild) get_prop(hal_thermal_default, vendor_thermal_prop) diff --git a/sepolicy/vendor/service.te b/sepolicy/vendor/service.te index 1e6a8a5..e69de29 100644 --- a/sepolicy/vendor/service.te +++ b/sepolicy/vendor/service.te @@ -1 +0,0 @@ -type hal_hyper_service, hal_service_type, service_manager_type; diff --git a/sepolicy/vendor/service_contexts b/sepolicy/vendor/service_contexts index 45c2aea..3d58270 100644 --- a/sepolicy/vendor/service_contexts +++ b/sepolicy/vendor/service_contexts @@ -1,6 +1,3 @@ -# Hyper -vendor.samsung.hardware.hyper.ISehHyPer/default u:object_r:hal_hyper_service:s0 - # Gnss vendor.samsung.hardware.gnss.ISehGnss/default u:object_r:hal_gnss_service:s0 diff --git a/vintf/device_framework_matrix.xml b/vintf/device_framework_matrix.xml index ad5edc3..e6cf6b3 100644 --- a/vintf/device_framework_matrix.xml +++ b/vintf/device_framework_matrix.xml @@ -109,14 +109,6 @@ default - - vendor.samsung.hardware.hyper - 2 - - ISehHyPer - default - - vendor.samsung.hardware.bluetooth.audio