From f758a48142e93d1dc21ac6c0030c08853823c668 Mon Sep 17 00:00:00 2001
From: LuK1337 <priv.luk@gmail.com>
Date: Wed, 13 Jan 2021 12:34:45 +0100
Subject: [PATCH] sm8250-common: Add vintf fragments for all local Lineage HALs

Change-Id: Iffa3e7bc3d01c2c8975ee9ea2eb03adf93d175e6
---
 fod/Android.bp                                |  1 +
 ...rint.inscreen@1.0-service.oneplus_kona.xml | 11 +++++
 livedisplay/Android.bp                        |  1 +
 ...e.livedisplay@2.0-service.oneplus_kona.xml | 19 ++++++++
 manifest.xml                                  | 44 -------------------
 powershare/Android.bp                         |  1 +
 ...ge.powershare@1.0-service.oneplus_kona.xml | 11 +++++
 touch/Android.bp                              |  1 +
 ...lineage.touch@1.0-service.oneplus_kona.xml | 11 +++++
 9 files changed, 56 insertions(+), 44 deletions(-)
 create mode 100644 fod/vendor.lineage.biometrics.fingerprint.inscreen@1.0-service.oneplus_kona.xml
 create mode 100644 livedisplay/vendor.lineage.livedisplay@2.0-service.oneplus_kona.xml
 create mode 100644 powershare/vendor.lineage.powershare@1.0-service.oneplus_kona.xml
 create mode 100644 touch/vendor.lineage.touch@1.0-service.oneplus_kona.xml

diff --git a/fod/Android.bp b/fod/Android.bp
index d178650..49dbb6e 100644
--- a/fod/Android.bp
+++ b/fod/Android.bp
@@ -18,6 +18,7 @@ oneplus_kona_fod_hal_binary {
     defaults: ["hidl_defaults"],
     name: "vendor.lineage.biometrics.fingerprint.inscreen@1.0-service.oneplus_kona",
     init_rc: ["vendor.lineage.biometrics.fingerprint.inscreen@1.0-service.oneplus_kona.rc"],
+    vintf_fragments: ["vendor.lineage.biometrics.fingerprint.inscreen@1.0-service.oneplus_kona.xml"],
     srcs: ["service.cpp", "FingerprintInscreen.cpp"],
     shared_libs: [
         "libbase",
diff --git a/fod/vendor.lineage.biometrics.fingerprint.inscreen@1.0-service.oneplus_kona.xml b/fod/vendor.lineage.biometrics.fingerprint.inscreen@1.0-service.oneplus_kona.xml
new file mode 100644
index 0000000..e03c70c
--- /dev/null
+++ b/fod/vendor.lineage.biometrics.fingerprint.inscreen@1.0-service.oneplus_kona.xml
@@ -0,0 +1,11 @@
+<manifest version="1.0" type="device">
+    <hal format="hidl">
+        <name>vendor.lineage.biometrics.fingerprint.inscreen</name>
+        <transport>hwbinder</transport>
+        <version>1.0</version>
+        <interface>
+            <name>IFingerprintInscreen</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+</manifest>
diff --git a/livedisplay/Android.bp b/livedisplay/Android.bp
index 467c164..bdd6f27 100644
--- a/livedisplay/Android.bp
+++ b/livedisplay/Android.bp
@@ -16,6 +16,7 @@
 cc_binary {
     name: "vendor.lineage.livedisplay@2.0-service.oneplus_kona",
     init_rc: ["vendor.lineage.livedisplay@2.0-service.oneplus_kona.rc"],
+    vintf_fragments: ["vendor.lineage.livedisplay@2.0-service.oneplus_kona.xml"],
     defaults: ["hidl_defaults"],
     relative_install_path: "hw",
     srcs: [
diff --git a/livedisplay/vendor.lineage.livedisplay@2.0-service.oneplus_kona.xml b/livedisplay/vendor.lineage.livedisplay@2.0-service.oneplus_kona.xml
new file mode 100644
index 0000000..9e02776
--- /dev/null
+++ b/livedisplay/vendor.lineage.livedisplay@2.0-service.oneplus_kona.xml
@@ -0,0 +1,19 @@
+<manifest version="1.0" type="device">
+    <hal format="hidl">
+        <name>vendor.lineage.livedisplay</name>
+        <transport>hwbinder</transport>
+        <version>2.0</version>
+        <interface>
+            <name>IDisplayModes</name>
+            <instance>default</instance>
+        </interface>
+        <interface>
+            <name>IPictureAdjustment</name>
+            <instance>default</instance>
+        </interface>
+        <interface>
+            <name>ISunlightEnhancement</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+</manifest>
diff --git a/manifest.xml b/manifest.xml
index b57e22a..4abc7f6 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -208,50 +208,6 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="hidl">
-        <name>vendor.lineage.biometrics.fingerprint.inscreen</name>
-        <transport>hwbinder</transport>
-        <version>1.0</version>
-        <interface>
-            <name>IFingerprintInscreen</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-    <hal format="hidl">
-        <name>vendor.lineage.livedisplay</name>
-        <transport>hwbinder</transport>
-        <version>2.0</version>
-        <interface>
-            <name>IDisplayModes</name>
-            <instance>default</instance>
-        </interface>
-        <interface>
-            <name>IPictureAdjustment</name>
-            <instance>default</instance>
-        </interface>
-        <interface>
-            <name>ISunlightEnhancement</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-    <hal format="hidl">
-        <name>vendor.lineage.touch</name>
-        <transport>hwbinder</transport>
-        <version>1.0</version>
-        <interface>
-            <name>ITouchscreenGesture</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-    <hal format="hidl">
-        <name>vendor.lineage.powershare</name>
-        <transport>hwbinder</transport>
-        <version>1.0</version>
-        <interface>
-            <name>IPowerShare</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
     <hal format="hidl">
         <name>vendor.goodix.hardware.biometrics.fingerprint</name>
         <transport>hwbinder</transport>
diff --git a/powershare/Android.bp b/powershare/Android.bp
index de07fe0..93b9431 100644
--- a/powershare/Android.bp
+++ b/powershare/Android.bp
@@ -18,6 +18,7 @@ cc_binary {
     defaults: ["hidl_defaults"],
     name: "vendor.lineage.powershare@1.0-service.oneplus_kona",
     init_rc: ["vendor.lineage.powershare@1.0-service.oneplus_kona.rc"],
+    vintf_fragments: ["vendor.lineage.powershare@1.0-service.oneplus_kona.xml"],
     srcs: ["service.cpp", "PowerShare.cpp"],
     shared_libs: [
         "libbase",
diff --git a/powershare/vendor.lineage.powershare@1.0-service.oneplus_kona.xml b/powershare/vendor.lineage.powershare@1.0-service.oneplus_kona.xml
new file mode 100644
index 0000000..b4af2cd
--- /dev/null
+++ b/powershare/vendor.lineage.powershare@1.0-service.oneplus_kona.xml
@@ -0,0 +1,11 @@
+<manifest version="1.0" type="device">
+    <hal format="hidl">
+        <name>vendor.lineage.powershare</name>
+        <transport>hwbinder</transport>
+        <version>1.0</version>
+        <interface>
+            <name>IPowerShare</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+</manifest>
diff --git a/touch/Android.bp b/touch/Android.bp
index 2c8bff8..004e94c 100644
--- a/touch/Android.bp
+++ b/touch/Android.bp
@@ -16,6 +16,7 @@
 cc_binary {
     name: "vendor.lineage.touch@1.0-service.oneplus_kona",
     init_rc: ["vendor.lineage.touch@1.0-service.oneplus_kona.rc"],
+    vintf_fragments: ["vendor.lineage.touch@1.0-service.oneplus_kona.xml"],
     defaults: ["hidl_defaults"],
     relative_install_path: "hw",
     srcs: [
diff --git a/touch/vendor.lineage.touch@1.0-service.oneplus_kona.xml b/touch/vendor.lineage.touch@1.0-service.oneplus_kona.xml
new file mode 100644
index 0000000..fb862bb
--- /dev/null
+++ b/touch/vendor.lineage.touch@1.0-service.oneplus_kona.xml
@@ -0,0 +1,11 @@
+<manifest version="1.0" type="device">
+    <hal format="hidl">
+        <name>vendor.lineage.touch</name>
+        <transport>hwbinder</transport>
+        <version>1.0</version>
+        <interface>
+            <name>ITouchscreenGesture</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+</manifest>