From 72dd785a51a2d7dddea0f9df17d573c9ff6a133a Mon Sep 17 00:00:00 2001
From: Sebastiano Barezzi <barezzisebastiano@gmail.com>
Date: Wed, 9 Feb 2022 15:15:55 +0100
Subject: [PATCH] sdm710-common: Build Xiaomi IR HIDL

Change-Id: I01378830151f3c6fff84f9c1f0ebcbff21e26e0e
---
 lineage.dependencies |  4 ++++
 manifest.xml         | 10 ----------
 sdm710.mk            |  7 ++++++-
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/lineage.dependencies b/lineage.dependencies
index 8acfa0c..cee2bca 100644
--- a/lineage.dependencies
+++ b/lineage.dependencies
@@ -1,4 +1,8 @@
 [
+  {
+    "repository": "android_hardware_xiaomi",
+    "target_path": "hardware/xiaomi"
+  },
   {
     "repository": "android_kernel_xiaomi_sdm710",
     "target_path": "kernel/xiaomi/sdm710"
diff --git a/manifest.xml b/manifest.xml
index c70fee4..44fec78 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -116,16 +116,6 @@
         </interface>
         <fqname>@2.1::IMapper/default</fqname>
     </hal>
-    <hal format="hidl">
-        <name>android.hardware.ir</name>
-        <transport>hwbinder</transport>
-        <version>1.0</version>
-        <interface>
-            <name>IConsumerIr</name>
-            <instance>default</instance>
-        </interface>
-        <fqname>@1.0::IConsumerIr/default</fqname>
-    </hal>
     <hal format="hidl">
         <name>android.hardware.keymaster</name>
         <transport>hwbinder</transport>
diff --git a/sdm710.mk b/sdm710.mk
index 362ec6f..9feb8b4 100644
--- a/sdm710.mk
+++ b/sdm710.mk
@@ -63,12 +63,17 @@ PRODUCT_PACKAGES += \
     vendor.qti.hardware.camera.device@1.0.vendor \
     vendor.qti.hardware.camera.postproc@1.0.vendor
 
+# Consumer IR
+PRODUCT_PACKAGES += \
+    android.hardware.ir@1.0-service.xiaomi
+
 # Overlays
 PRODUCT_ENFORCE_RRO_TARGETS := *
 
 # Soong namespaces
 PRODUCT_SOONG_NAMESPACES += \
-    $(LOCAL_PATH)
+    $(LOCAL_PATH) \
+    hardware/xiaomi
 
 # Inherit the proprietary files
 $(call inherit-product, vendor/xiaomi/sdm710-common/sdm710-common-vendor.mk)