sdm660-common: ir: Rebrand to Xiaomi SDM660

Change-Id: I20146c0bc065a460f5a86455ed9a21abce5f9417
LineageOS · Sep 20, 2021 · 91c106c · 91c106c
1 parent c280fad
commit 91c106c
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 6 deletions.
diff --git 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
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#define LOG_TAG "ConsumerIrService"
+#define LOG_TAG "ConsumerIrService.xiaomi_sdm660"
 
 #include <android-base/logging.h>
 

diff --git a/ir/android.hardware.ir@1.0-service.rc → ....hardware.ir@1.0-service.xiaomi_sdm660.rc b/ir/android.hardware.ir@1.0-service.rc → ....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 → ...hardware.ir@1.0-service.xiaomi_sdm660.xml b/ir/android.hardware.ir@1.0-service.xml → ...hardware.ir@1.0-service.xiaomi_sdm660.xml
diff --git 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 <android-base/logging.h>
 #include <hidl/HidlTransportSupport.h>

diff --git 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