commit bf111719d3d301c3b0db3ce1469912c4e5cd97c6
author Justin Yun <justinyun@google.com> Tue Mar 13 01:19:59 2018 +0000
committer android-build-merger <android-build-merger@google.com> Tue Mar 13 01:19:59 2018 +0000
tree 21b4b237c0f1e4e356d61cbd660118c17862809c
parent ecc9f25a829adf319cca957b308fcbdff2525790
parent 46d57765096edd126cdffc869fb79ca19d36b184

Merge "Use default libnfc-nci.conf if not found in vendor/etc" am: 1988d976ec
am: 46d5776509

Change-Id: I4da8b5acef9e086526c44ebc074d8efb3d456b4f

target/product/treble_common.mk

diff --git a/target/product/treble_common.mk b/target/product/treble_common.mk
index cd5442f..8fa2974 100644
--- a/target/product/treble_common.mk
+++ b/target/product/treble_common.mk
@@ -66,6 +66,12 @@
 PRODUCT_COPY_FILES += \
     device/generic/goldfish/data/etc/apns-conf.xml:system/etc/apns-conf.xml
 
+# NFC:
+#   Provide default libnfc-nci.conf file for devices that does not have one in
+#   vendor/etc
+PRODUCT_COPY_FILES += \
+    device/generic/common/nfc/libnfc-nci.conf:system/etc/libnfc-nci.conf
+
 # Support for the devices with no VNDK enforcing
 PRODUCT_COPY_FILES += \
     build/make/target/product/vndk/init.gsi.rc:system/etc/init/init.gsi.rc \