Merge "Use inclusive language for PRODUCT_ARTIFACT_PATH_REQUIREMENT_ALLOWED_LIST"
diff --git a/mgsi/csi_arm64.mk b/mgsi/csi_arm64.mk
index cbe69f6..4155257 100644
--- a/mgsi/csi_arm64.mk
+++ b/mgsi/csi_arm64.mk
@@ -32,8 +32,6 @@
#
# All components below go to product image
#
-# NFC: Provide a libnfc-nci.conf to CSI (to avoid nfc related exceptions)
-PRODUCT_COPY_FILES += device/generic/common/nfc/libnfc-nci.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf
#
# Special settings to skip mount product and system_ext on the device,
diff --git a/mgsi/csi_x86.mk b/mgsi/csi_x86.mk
index a041f14..801f236 100644
--- a/mgsi/csi_x86.mk
+++ b/mgsi/csi_x86.mk
@@ -31,8 +31,6 @@
#
# All components below go to product image
#
-# NFC: Provide a libnfc-nci.conf to CSI (to avoid nfc related exceptions)
-PRODUCT_COPY_FILES += device/generic/common/nfc/libnfc-nci.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf
#
# Special settings to skip mount product and system_ext on the device,
diff --git a/mgsi/mgsi_product.mk b/mgsi/mgsi_product.mk
index 2bc04b9..fd92388 100644
--- a/mgsi/mgsi_product.mk
+++ b/mgsi/mgsi_product.mk
@@ -36,8 +36,3 @@
# Provide a APN configuration to GSI product
PRODUCT_COPY_FILES += \
device/sample/etc/apns-full-conf.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/apns-conf.xml
-
-# NFC:
-# Provide a libnfc-nci.conf to GSI product
-PRODUCT_COPY_FILES += \
- device/generic/common/nfc/libnfc-nci.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf
