commit 91a50d89dfaadb39597e89c44c4a44cbc8ab5b34
author Justin Yun <justinyun@google.com> Tue Mar 13 03:06:02 2018 +0000
committer android-build-merger <android-build-merger@google.com> Tue Mar 13 03:06:02 2018 +0000
tree 910cdd21a4668da0b6cea760bc5904b27c556197
parent e93dad03995bf9d24510f68fb455adb7fc148a76
parent bf111719d3d301c3b0db3ce1469912c4e5cd97c6

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

Change-Id: Icf0b6c5be660229d6905623adeec8e18ac9b6992

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 \