sm6375-common: Reworking on NFC manifest

This commit is contained in:
Andy | アンディ
2023-09-05 17:30:17 +08:00
parent 7ac1c52300
commit 92da6c66ff
4 changed files with 55 additions and 32 deletions

View File

@@ -217,7 +217,9 @@ BOARD_AVB_RECOVERY_ROLLBACK_INDEX_LOCATION := 1
# VINTF
DEVICE_MATRIX_FILE := $(COMMON_PATH)/vintf/compatibility_matrix.xml
DEVICE_MANIFEST_FILE := $(COMMON_PATH)/vintf/manifest.xml
DEVICE_MANIFEST_FILE := \
$(COMMON_PATH)/vintf/manifest.xml \
$(COMMON_PATH)/vintf/manifest_nfc.xml
DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE := \
$(COMMON_PATH)/vintf/framework_compatibility_matrix.xml \

View File

@@ -136,6 +136,14 @@
<instance>cnd</instance>
</interface>
</hal>
<hal format="hidl" optional="true">
<name>vendor.nxp.nxpese</name>
<version>1.0</version>
<interface>
<name>INxpEse</name>
<instance>default</instance>
</interface>
</hal>
<hal format="hidl" optional="true">
<name>vendor.nxp.nxpnfc</name>
<version>2.0</version>

View File

@@ -118,37 +118,6 @@
</interface>
<fqname>@1.1::IRadioConfig/default</fqname>
</hal>
<!-- NFC HAL service -->
<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>2.0</version>
<interface>
<name>INxpNfc</name>
<instance>default</instance>
</interface>
</hal>
<hal format="hidl">
<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">
<name>android.hardware.soundtrigger</name>
<transport>hwbinder</transport>

44
vintf/manifest_nfc.xml Normal file
View File

@@ -0,0 +1,44 @@
<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>
<fqname>@1.2::INfc/default</fqname>
</hal>
<hal format="hidl">
<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">
<name>vendor.nxp.nxpnfc</name>
<transport>hwbinder</transport>
<version>2.0</version>
<interface>
<name>INxpNfc</name>
<instance>default</instance>
</interface>
<fqname>@2.0::INxpNfc/default</fqname>
</hal>
<hal format="hidl">
<name>vendor.nxp.nxpese</name>
<transport>hwbinder</transport>
<version>1.0</version>
<interface>
<name>INxpEse</name>
<instance>default</instance>
</interface>
<fqname>@1.0::INxpEse/default</fqname>
</hal>
</manifest>