commit 6582fd5c9d47fc5585541ab0073323eef20b61ea
author SamarV-121 <samarvispute121@pm.me> Wed Dec 21 22:11:00 2022 +0530
committer SamarV-121 <samarvispute121@pm.me> Thu Dec 22 16:39:06 2022 +0530
tree a5fa3109b8e11160696c4880462a861e31b31b03
parent b54eaf182c2a8e1656c61f6fa12e9eab3e157ab9

RM6785: DeSKUify NFC HAL vintf config

Change-Id: Iedf166d101a73da4a3000cb2406d98d19f0e9dab

BoardConfig.mk

diff --git a/BoardConfig.mk b/BoardConfig.mk
index 2536af9..a3961ef 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -58,8 +58,6 @@
 
 # HIDL
 DEVICE_MANIFEST_FILE := $(DEVICE_PATH)/manifest.xml
-ODM_MANIFEST_SKUS += nfc
-ODM_MANIFEST_NFC_FILES := $(DEVICE_PATH)/manifest_nfc.xml
 
 # Init
 TARGET_INIT_VENDOR_LIB := //$(DEVICE_PATH):libinit_RM6785

manifest.xml

diff --git a/manifest.xml b/manifest.xml
index 17c2b11..ca0873f 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -93,6 +93,15 @@
         <fqname>@1.0::IOmxStore/default</fqname>
     </hal>
     <hal format="hidl">
+        <name>android.hardware.nfc</name>
+        <transport>hwbinder</transport>
+        <version>1.2</version>
+        <interface>
+            <name>INfc</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="hidl">
         <name>android.hardware.radio</name>
         <transport>hwbinder</transport>
         <fqname>@1.2::IRadio/em1</fqname>
@@ -417,6 +426,24 @@
         </interface>
     </hal>
     <hal format="hidl">
+        <name>vendor.nxp.nxpnfc</name>
+        <transport>hwbinder</transport>
+        <version>1.0</version>
+        <interface>
+            <name>INxpNfc</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="hidl">
+        <name>vendor.nxp.nxpese</name>
+        <transport>hwbinder</transport>
+        <version>1.0</version>
+        <interface>
+            <name>INxpEse</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="hidl">
         <name>vendor.oplus.hardware.biometrics.fingerprint</name>
         <transport>hwbinder</transport>
         <version>2.1</version>

manifest_nfc.xml

diff --git a/manifest_nfc.xml b/manifest_nfc.xml
deleted file mode 100644
index af6a38a..0000000
--- a/manifest_nfc.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<manifest version="1.0" type="device">
-    <hal format="hidl">
-        <name>android.hardware.nfc</name>
-        <transport>hwbinder</transport>
-        <version>1.2</version>
-        <interface>
-            <name>INfc</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-    <hal format="hidl">
-        <name>vendor.nxp.nxpnfc</name>
-        <transport>hwbinder</transport>
-        <version>1.0</version>
-        <interface>
-            <name>INxpNfc</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-    <hal format="hidl">
-        <name>vendor.nxp.nxpese</name>
-        <transport>hwbinder</transport>
-        <version>1.0</version>
-        <interface>
-            <name>INxpEse</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-</manifest>