donjohanliebert/device_motorola_sm7325-common
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sm7325-common: Guard android.hardware.nfc HIDL entry

Browse Source 
tundra uses snxxx NFC AIDL HAL which doesn't use android.hardware.nfc,
so let's guard it so we don't have to decommonize it for just one device

Change-Id: Ic8d78a401c614ea4b19c7fccdc7f472bc67534d6
This commit is contained in:
Marc Bourgoin 2024-12-22 00:11:44 -07:00
parent 2a9523e21b
commit 04b45dcda0
3 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
BoardConfigCommon.mk
View File

@ -116,6 +116,9 @@ DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE := \
vendor/lineage/config/device_framework_matrix.xml vendor/lineage/config/device_framework_matrix.xml
DEVICE_MATRIX_FILE := hardware/qcom-caf/common/compatibility_matrix.xml DEVICE_MATRIX_FILE := hardware/qcom-caf/common/compatibility_matrix.xml
DEVICE_MANIFEST_FILE += $(COMMON_PATH)/manifest.xml DEVICE_MANIFEST_FILE += $(COMMON_PATH)/manifest.xml
ifeq ($(TARGET_HAS_SNXXX_NFC),)
DEVICE_MANIFEST_FILE += $(COMMON_PATH)/manifest_nfc.xml
endif
# Metadata # Metadata
BOARD_USES_METADATA_PARTITION := true BOARD_USES_METADATA_PARTITION := true

9
manifest.xml
View File

@ -68,15 +68,6 @@
<instance>default</instance> <instance>default</instance>
</interface> </interface>
</hal> </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"> <hal format="hidl">
<name>android.hardware.radio</name> <name>android.hardware.radio</name>
<transport>hwbinder</transport> <transport>hwbinder</transport>

11
manifest_nfc.xml Normal file
View File

@ -0,0 +1,11 @@
<manifest version="2.0" type="device" target-level="5">
<hal format="hidl">
<name>android.hardware.nfc</name>
<transport>hwbinder</transport>
<version>1.2</version>
<interface>
<name>INfc</name>
<instance>default</instance>
</interface>
</hal>
</manifest>