commit 46d57765096edd126cdffc869fb79ca19d36b184
author Justin Yun <justinyun@google.com> Tue Mar 13 01:09:22 2018 +0000
committer android-build-merger <android-build-merger@google.com> Tue Mar 13 01:09:22 2018 +0000
tree ebbf5fe184da0be6ffded84a890faf6d3a3efda9
parent 8119b3812e6a07ef61aa6766bf0db54745b09d53
parent 1988d976ec979ea9a6c4a5aacbcc5d9a0990ded6

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

Change-Id: I729cd256adbf7681f4ed988d28427ed66025772e

target/product/treble_common.mk

diff --git a/target/product/treble_common.mk b/target/product/treble_common.mk
index e9a97cd..5352e77 100644
--- a/target/product/treble_common.mk
+++ b/target/product/treble_common.mk
@@ -70,6 +70,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 \