diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 10d7dd5..2726809 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -116,6 +116,9 @@ DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE := \
vendor/lineage/config/device_framework_matrix.xml
DEVICE_MATRIX_FILE := hardware/qcom-caf/common/compatibility_matrix.xml
DEVICE_MANIFEST_FILE += $(COMMON_PATH)/manifest.xml
+ifeq ($(TARGET_HAS_SNXXX_NFC),)
+DEVICE_MANIFEST_FILE += $(COMMON_PATH)/manifest_nfc.xml
+endif
# Metadata
BOARD_USES_METADATA_PARTITION := true
diff --git a/manifest.xml b/manifest.xml
index d0d385f..9c97c49 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -68,15 +68,6 @@
default
-
- android.hardware.nfc
- hwbinder
- 1.2
-
- INfc
- default
-
-
android.hardware.radio
hwbinder
diff --git a/manifest_nfc.xml b/manifest_nfc.xml
new file mode 100644
index 0000000..e7a9ddc
--- /dev/null
+++ b/manifest_nfc.xml
@@ -0,0 +1,11 @@
+
+
+ android.hardware.nfc
+ hwbinder
+ 1.2
+
+ INfc
+ default
+
+
+