From 91c106c2951ed596750e8f431dcba8b3abcc73b1 Mon Sep 17 00:00:00 2001 From: Sebastiano Barezzi Date: Mon, 13 Sep 2021 01:27:22 +0200 Subject: sdm660-common: ir: Rebrand to Xiaomi SDM660 Change-Id: I20146c0bc065a460f5a86455ed9a21abce5f9417 --- ir/Android.bp | 6 +++--- ir/ConsumerIr.cpp | 2 +- ir/android.hardware.ir@1.0-service.rc | 5 ----- ir/android.hardware.ir@1.0-service.xiaomi_sdm660.rc | 5 +++++ ir/android.hardware.ir@1.0-service.xiaomi_sdm660.xml | 7 +++++++ ir/android.hardware.ir@1.0-service.xml | 7 ------- ir/service.cpp | 2 +- sepolicy/vendor/file_contexts | 3 +++ 8 files changed, 20 insertions(+), 17 deletions(-) delete mode 100644 ir/android.hardware.ir@1.0-service.rc create mode 100644 ir/android.hardware.ir@1.0-service.xiaomi_sdm660.rc create mode 100644 ir/android.hardware.ir@1.0-service.xiaomi_sdm660.xml delete mode 100644 ir/android.hardware.ir@1.0-service.xml diff --git a/ir/Android.bp b/ir/Android.bp index b9e782a..4db4936 100644 --- a/ir/Android.bp +++ b/ir/Android.bp @@ -5,11 +5,11 @@ // cc_binary { - name: "android.hardware.ir@1.0-service", + name: "android.hardware.ir@1.0-service.xiaomi_sdm660", defaults: ["hidl_defaults"], relative_install_path: "hw", - init_rc: ["android.hardware.ir@1.0-service.rc"], - vintf_fragments: ["android.hardware.ir@1.0-service.xml"], + init_rc: ["android.hardware.ir@1.0-service.xiaomi_sdm660.rc"], + vintf_fragments: ["android.hardware.ir@1.0-service.xiaomi_sdm660.xml"], srcs: [ "ConsumerIr.cpp", "service.cpp", diff --git a/ir/ConsumerIr.cpp b/ir/ConsumerIr.cpp index 14aa26a..d632d25 100644 --- a/ir/ConsumerIr.cpp +++ b/ir/ConsumerIr.cpp @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_TAG "ConsumerIrService" +#define LOG_TAG "ConsumerIrService.xiaomi_sdm660" #include diff --git a/ir/android.hardware.ir@1.0-service.rc b/ir/android.hardware.ir@1.0-service.rc deleted file mode 100644 index b2f1f7d..0000000 --- a/ir/android.hardware.ir@1.0-service.rc +++ /dev/null @@ -1,5 +0,0 @@ -service vendor.ir-hal-1-0 /vendor/bin/hw/android.hardware.ir@1.0-service - interface android.hardware.ir@1.0::IConsumerIr default - class hal - user system - group system diff --git a/ir/android.hardware.ir@1.0-service.xiaomi_sdm660.rc b/ir/android.hardware.ir@1.0-service.xiaomi_sdm660.rc new file mode 100644 index 0000000..320dd9a --- /dev/null +++ b/ir/android.hardware.ir@1.0-service.xiaomi_sdm660.rc @@ -0,0 +1,5 @@ +service vendor.ir-hal-1-0 /vendor/bin/hw/android.hardware.ir@1.0-service.xiaomi_sdm660 + interface android.hardware.ir@1.0::IConsumerIr default + class hal + user system + group system diff --git a/ir/android.hardware.ir@1.0-service.xiaomi_sdm660.xml b/ir/android.hardware.ir@1.0-service.xiaomi_sdm660.xml new file mode 100644 index 0000000..a188190 --- /dev/null +++ b/ir/android.hardware.ir@1.0-service.xiaomi_sdm660.xml @@ -0,0 +1,7 @@ + + + android.hardware.ir + hwbinder + @1.0::IConsumerIr/default + + diff --git a/ir/android.hardware.ir@1.0-service.xml b/ir/android.hardware.ir@1.0-service.xml deleted file mode 100644 index a188190..0000000 --- a/ir/android.hardware.ir@1.0-service.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - android.hardware.ir - hwbinder - @1.0::IConsumerIr/default - - diff --git a/ir/service.cpp b/ir/service.cpp index 3af6202..ad32be2 100644 --- a/ir/service.cpp +++ b/ir/service.cpp @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define LOG_TAG "android.hardware.ir@1.0-service" +#define LOG_TAG "android.hardware.ir@1.0-service.xiaomi_sdm660" #include #include diff --git a/sepolicy/vendor/file_contexts b/sepolicy/vendor/file_contexts index f1d7aee..04f6cec 100644 --- a/sepolicy/vendor/file_contexts +++ b/sepolicy/vendor/file_contexts @@ -21,6 +21,9 @@ /dev/lirc0 u:object_r:spidev_device:s0 /dev/spidev7.1 u:object_r:spidev_device:s0 +# IR HAL +/(vendor|system/vendor)/bin/hw/android\.hardware\.ir@1\.0-service\.xiaomi_sdm660 u:object_r:hal_ir_default_exec:s0 + # Light HAL /(vendor|system/vendor)/bin/hw/android\.hardware\.light@2\.0-service\.xiaomi_sdm660 u:object_r:hal_light_default_exec:s0 -- cgit v1.2.3