From 7bd40b3a4ebd81e1e48c2289eb8523e532650dcf Mon Sep 17 00:00:00 2001 From: roynatech2544 Date: Tue, 12 Apr 2022 11:56:10 +0900 Subject: [PATCH] universal7885: interfaces: Move to /vendor/bin * Is not Android core hal, so moving it from /vendor/bin/hw --- .../interfaces/hardware/fmradio/1.2/default/Android.bp | 1 - .../1.2/default/vendor.eureka.hardware.fmradio@1.2-service.rc | 2 +- .../hardware/interfaces/hardware/parts/1.0/default/Android.bp | 1 - .../1.0/default/vendor.eureka.hardware.parts@1.0-service.rc | 2 +- universal7885-common/sepolicy/vendor/file_contexts | 4 ++-- 5 files changed, 4 insertions(+), 6 deletions(-) diff --git a/universal7885-common/hardware/interfaces/hardware/fmradio/1.2/default/Android.bp b/universal7885-common/hardware/interfaces/hardware/fmradio/1.2/default/Android.bp index c48e785..2d5b2ea 100644 --- a/universal7885-common/hardware/interfaces/hardware/fmradio/1.2/default/Android.bp +++ b/universal7885-common/hardware/interfaces/hardware/fmradio/1.2/default/Android.bp @@ -2,7 +2,6 @@ cc_binary { name: "vendor.eureka.hardware.fmradio@1.2-service", - relative_install_path: "hw", proprietary: true, srcs: [ "FMRadio.cpp", diff --git a/universal7885-common/hardware/interfaces/hardware/fmradio/1.2/default/vendor.eureka.hardware.fmradio@1.2-service.rc b/universal7885-common/hardware/interfaces/hardware/fmradio/1.2/default/vendor.eureka.hardware.fmradio@1.2-service.rc index 0582ba3..f747b3f 100644 --- a/universal7885-common/hardware/interfaces/hardware/fmradio/1.2/default/vendor.eureka.hardware.fmradio@1.2-service.rc +++ b/universal7885-common/hardware/interfaces/hardware/fmradio/1.2/default/vendor.eureka.hardware.fmradio@1.2-service.rc @@ -1,4 +1,4 @@ -service vendor.fm-hal /vendor/bin/hw/vendor.eureka.hardware.fmradio@1.2-service +service vendor.fm-hal /vendor/bin/vendor.eureka.hardware.fmradio@1.2-service interface vendor.eureka.hardware.fmradio@1.0::IFMRadio default interface vendor.eureka.hardware.fmradio@1.1::IFMRadio default interface vendor.eureka.hardware.fmradio@1.2::IFMRadio default diff --git a/universal7885-common/hardware/interfaces/hardware/parts/1.0/default/Android.bp b/universal7885-common/hardware/interfaces/hardware/parts/1.0/default/Android.bp index 4235402..8d6aca2 100644 --- a/universal7885-common/hardware/interfaces/hardware/parts/1.0/default/Android.bp +++ b/universal7885-common/hardware/interfaces/hardware/parts/1.0/default/Android.bp @@ -2,7 +2,6 @@ cc_binary { name: "vendor.eureka.hardware.parts@1.0-service", - relative_install_path: "hw", proprietary: true, srcs: [ "Battery.cpp", diff --git a/universal7885-common/hardware/interfaces/hardware/parts/1.0/default/vendor.eureka.hardware.parts@1.0-service.rc b/universal7885-common/hardware/interfaces/hardware/parts/1.0/default/vendor.eureka.hardware.parts@1.0-service.rc index 4aba9d3..3f84d9c 100644 --- a/universal7885-common/hardware/interfaces/hardware/parts/1.0/default/vendor.eureka.hardware.parts@1.0-service.rc +++ b/universal7885-common/hardware/interfaces/hardware/parts/1.0/default/vendor.eureka.hardware.parts@1.0-service.rc @@ -1,4 +1,4 @@ -service vendor.parts-hal /vendor/bin/hw/vendor.eureka.hardware.parts@1.0-service +service vendor.parts-hal /vendor/bin/vendor.eureka.hardware.parts@1.0-service interface vendor.eureka.hardware.parts@1.0::IBatteryStats default interface vendor.eureka.hardware.parts@1.0::IDisplayConfigs default interface vendor.eureka.hardware.parts@1.0::IFlashBrightness default diff --git a/universal7885-common/sepolicy/vendor/file_contexts b/universal7885-common/sepolicy/vendor/file_contexts index 9420441..dad4db5 100644 --- a/universal7885-common/sepolicy/vendor/file_contexts +++ b/universal7885-common/sepolicy/vendor/file_contexts @@ -216,9 +216,9 @@ /(vendor|system/vendor)/firmware(/.*)? u:object_r:vendor_firmware_file:s0 # SamsungParts -/(vendor|system/vendor)/bin/hw/vendor\.eureka\.hardware\.parts@[0-9]\.[0-9]-service u:object_r:hal_parts_default_exec:s0 +/(vendor|system/vendor)/bin/vendor\.eureka\.hardware\.parts@[0-9]\.[0-9]-service u:object_r:hal_parts_default_exec:s0 # FMRadio -/(vendor|system/vendor)/bin/hw/vendor\.eureka\.hardware\.fmradio@[0-9]\.[0-9]-service u:object_r:hal_fmradio_default_exec:s0 +/(vendor|system/vendor)/bin/vendor\.eureka\.hardware\.fmradio@[0-9]\.[0-9]-service u:object_r:hal_fmradio_default_exec:s0 /dev/radio0 u:object_r:fm_radio_device:s0 /factory(/.*)? u:object_r:sec_efs_file:s0