From dfe28813cfd8b53d181ee347008bcb219392b5d3 Mon Sep 17 00:00:00 2001
From: Sebastiano Barezzi <barezzisebastiano@gmail.com>
Date: Mon, 13 Sep 2021 15:35:47 +0200
Subject: sdm660-common: Add VINTF fragments to our AIDLs/HIDLs

Change-Id: Ibe89b7a99929cd8e52424be502094997194a476f
---
 biometrics/Android.bp                                          |  1 +
 ...rdware.biometrics.fingerprint@2.1-service.xiaomi_sdm660.xml |  7 +++++++
 light/Android.bp                                               |  1 +
 light/android.hardware.light@2.0-service.xiaomi_sdm660.xml     |  7 +++++++
 manifest.xml                                                   | 10 ----------
 5 files changed, 16 insertions(+), 10 deletions(-)
 create mode 100644 biometrics/android.hardware.biometrics.fingerprint@2.1-service.xiaomi_sdm660.xml
 create mode 100644 light/android.hardware.light@2.0-service.xiaomi_sdm660.xml

diff --git a/biometrics/Android.bp b/biometrics/Android.bp
index 7428c09..bf6e9da 100644
--- a/biometrics/Android.bp
+++ b/biometrics/Android.bp
@@ -18,6 +18,7 @@ cc_binary {
     relative_install_path: "hw",
     defaults: ["hidl_defaults"],
     init_rc: ["android.hardware.biometrics.fingerprint@2.1-service.xiaomi_sdm660.rc"],
+    vintf_fragments: ["android.hardware.biometrics.fingerprint@2.1-service.xiaomi_sdm660.xml"],
     srcs: ["service.cpp", "BiometricsFingerprint.cpp"],
     shared_libs: [
         "libbase",
diff --git a/biometrics/android.hardware.biometrics.fingerprint@2.1-service.xiaomi_sdm660.xml b/biometrics/android.hardware.biometrics.fingerprint@2.1-service.xiaomi_sdm660.xml
new file mode 100644
index 0000000..1c3c59b
--- /dev/null
+++ b/biometrics/android.hardware.biometrics.fingerprint@2.1-service.xiaomi_sdm660.xml
@@ -0,0 +1,7 @@
+<manifest version="1.0" type="device">
+    <hal format="hidl">
+        <name>android.hardware.biometrics.fingerprint</name>
+        <transport>hwbinder</transport>
+        <fqname>@2.1::IBiometricsFingerprint/default</fqname>
+    </hal>
+</manifest>
diff --git a/light/Android.bp b/light/Android.bp
index 1e1b93b..b6910e6 100644
--- a/light/Android.bp
+++ b/light/Android.bp
@@ -17,6 +17,7 @@ cc_binary {
     defaults: ["hidl_defaults"],
     name: "android.hardware.light@2.0-service.xiaomi_sdm660",
     init_rc: ["android.hardware.light@2.0-service.xiaomi_sdm660.rc"],
+    vintf_fragments: ["android.hardware.light@2.0-service.xiaomi_sdm660.xml"],
     srcs: ["service.cpp", "Light.cpp"],
     shared_libs: [
         "libbase",
diff --git a/light/android.hardware.light@2.0-service.xiaomi_sdm660.xml b/light/android.hardware.light@2.0-service.xiaomi_sdm660.xml
new file mode 100644
index 0000000..eac7e85
--- /dev/null
+++ b/light/android.hardware.light@2.0-service.xiaomi_sdm660.xml
@@ -0,0 +1,7 @@
+<manifest version="1.0" type="device">
+    <hal format="hidl">
+        <name>android.hardware.light</name>
+        <transport>hwbinder</transport>
+        <fqname>@2.0::ILight/default</fqname>
+    </hal>
+</manifest>
diff --git a/manifest.xml b/manifest.xml
index 6f5b6cd..c5041cb 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -9,11 +9,6 @@
         <transport>hwbinder</transport>
         <fqname>@5.0::IEffectsFactory/default</fqname>
     </hal>
-    <hal format="hidl">
-        <name>android.hardware.biometrics.fingerprint</name>
-        <transport>hwbinder</transport>
-        <fqname>@2.1::IBiometricsFingerprint/default</fqname>
-    </hal>
     <hal format="hidl">
         <name>android.hardware.bluetooth</name>
         <transport>hwbinder</transport>
@@ -62,11 +57,6 @@
         <transport arch="32+64">passthrough</transport>
         <fqname>@2.1::IMapper/default</fqname>
     </hal>
-    <hal format="hidl">
-        <name>android.hardware.light</name>
-        <transport>hwbinder</transport>
-        <fqname>@2.0::ILight/default</fqname>
-    </hal>
     <hal format="hidl">
         <name>android.hardware.media.omx</name>
         <transport>hwbinder</transport>
-- 
cgit v1.2.3