From fa7fa65ffbe081ebdc927547edcaeff70f3dfb3f Mon Sep 17 00:00:00 2001 From: Sebastiano Barezzi Date: Mon, 13 Sep 2021 01:27:22 +0200 Subject: [PATCH] sdm660-common: ir: Rebrand to Xiaomi SDM660 Change-Id: I20146c0bc065a460f5a86455ed9a21abce5f9417 Signed-off-by: clarencelol Signed-off-by: OdSazib --- ir/Android.bp | 6 +++--- ir/ConsumerIr.cpp | 2 +- ....rc => android.hardware.ir@1.0-service.xiaomi_sdm660.rc} | 2 +- ...ml => android.hardware.ir@1.0-service.xiaomi_sdm660.xml} | 0 ir/service.cpp | 2 +- sepolicy/vendor/file_contexts | 3 +++ 6 files changed, 9 insertions(+), 6 deletions(-) rename ir/{android.hardware.ir@1.0-service.rc => android.hardware.ir@1.0-service.xiaomi_sdm660.rc} (88%) rename ir/{android.hardware.ir@1.0-service.xml => android.hardware.ir@1.0-service.xiaomi_sdm660.xml} (100%) diff --git a/ir/Android.bp b/ir/Android.bp index b9e782a9..4db49365 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 14aa26a6..d632d259 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.xiaomi_sdm660.rc similarity index 88% rename from ir/android.hardware.ir@1.0-service.rc rename to ir/android.hardware.ir@1.0-service.xiaomi_sdm660.rc index b2f1f7d3..320dd9a6 100644 --- a/ir/android.hardware.ir@1.0-service.rc +++ b/ir/android.hardware.ir@1.0-service.xiaomi_sdm660.rc @@ -1,4 +1,4 @@ -service vendor.ir-hal-1-0 /vendor/bin/hw/android.hardware.ir@1.0-service +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 diff --git a/ir/android.hardware.ir@1.0-service.xml b/ir/android.hardware.ir@1.0-service.xiaomi_sdm660.xml similarity index 100% rename from ir/android.hardware.ir@1.0-service.xml rename to ir/android.hardware.ir@1.0-service.xiaomi_sdm660.xml diff --git a/ir/service.cpp b/ir/service.cpp index 3af62022..ad32be2b 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 4e40e539..f61e8a7d 100644 --- a/sepolicy/vendor/file_contexts +++ b/sepolicy/vendor/file_contexts @@ -42,6 +42,9 @@ /sys/devices/platform/kcal_ctrl.0(/.*)? u:object_r:kcal_dev:s0 /sys/bus/platform/drivers/kcal_ctrl(/.*)? u:object_r:kcal_dev: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