From e869737e5c3cf60ce2cb6eb988037ca8e11b07a7 Mon Sep 17 00:00:00 2001
From: SGCMarkus <markusornik@gmail.com>
Date: Tue, 4 Jul 2023 18:00:32 +0200
Subject: [PATCH] rtwo: setup different manifest for different SKUs regarding
 eSE

---
 BoardConfig.mk                                 |  5 +++--
 manifest_rtwo_dn.xml                           | 18 ++++++++++++++++++
 manifest_rtwo_ese.xml => manifest_rtwo_dne.xml |  4 ++--
 3 files changed, 23 insertions(+), 4 deletions(-)
 create mode 100644 manifest_rtwo_dn.xml
 rename manifest_rtwo_ese.xml => manifest_rtwo_dne.xml (86%)

diff --git a/BoardConfig.mk b/BoardConfig.mk
index 69927fb..b88db31 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -29,8 +29,9 @@ TARGET_BOOTLOADER_BOARD_NAME := rtwo
 # HIDL
 DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE += $(DEVICE_PATH)/device_framework_matrix_rtwo.xml
 DEVICE_MANIFEST_CAPE_FILES += $(DEVICE_PATH)/manifest_rtwo.xml
-ODM_MANIFEST_SKUS += dne
-ODM_MANIFEST_DNE_FILES := $(DEVICE_PATH)/manifest_rtwo_ese.xml
+ODM_MANIFEST_SKUS += dn dne
+ODM_MANIFEST_DN_FILES := $(DEVICE_PATH)/manifest_rtwo_dn.xml
+ODM_MANIFEST_DNE_FILES := $(DEVICE_PATH)/manifest_rtwo_dne.xml
 
 # Kernel
 TARGET_KERNEL_CONFIG += \
diff --git a/manifest_rtwo_dn.xml b/manifest_rtwo_dn.xml
new file mode 100644
index 0000000..dcfcad4
--- /dev/null
+++ b/manifest_rtwo_dn.xml
@@ -0,0 +1,18 @@
+<manifest version="5.0" type="device">
+    <hal format="hidl" override="true">
+        <name>android.hardware.secure_element</name>
+        <transport>hwbinder</transport>
+        <version>1.2</version>
+        <interface>
+            <name>ISecureElement</name>
+            <instance>SIM1</instance>
+            <instance>SIM2</instance>
+        </interface>
+        <fqname>@1.2::ISecureElement/SIM1</fqname>
+        <fqname>@1.2::ISecureElement/SIM2</fqname>
+    </hal>
+    <hal format="hidl" override="true">
+        <name>vendor.qti.esepowermanager</name>
+        <transport>hwbinder</transport>
+    </hal>
+</manifest>
diff --git a/manifest_rtwo_ese.xml b/manifest_rtwo_dne.xml
similarity index 86%
rename from manifest_rtwo_ese.xml
rename to manifest_rtwo_dne.xml
index c8f23e4..5e4f2ca 100644
--- a/manifest_rtwo_ese.xml
+++ b/manifest_rtwo_dne.xml
@@ -1,5 +1,5 @@
-<manifest version="2.0" type="device">
-    <hal format="hidl">
+<manifest version="5.0" type="device">
+    <hal format="hidl" override="true">
         <name>android.hardware.secure_element</name>
         <transport>hwbinder</transport>
         <version>1.2</version>