From f39f5609371f071dd5d45b06b2af934e49981402 Mon Sep 17 00:00:00 2001 From: Justin Yun Date: Mon, 19 Feb 2018 18:07:37 +0900 Subject: [PATCH] Use default libnfc-nci.conf if not found in vendor/etc If libnfc-nci.conf is not installed in vendor/etc, use default configuration file in system/etc on GSI. Bug: 72080121 Test: Install GSI and remove vendor/etc/libnfc-nci.conf. Check if nfc is available in settings menu. Change-Id: Icc6e0b1d2b29adacf085cfa68566b064e736d3fa Merged-In: Icc6e0b1d2b29adacf085cfa68566b064e736d3fa (cherry picked from commit 746684376a85bab987ee59772681f4725e9fdf74) --- target/product/treble_common.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/target/product/treble_common.mk b/target/product/treble_common.mk index cd5442fed..8fa29744e 100644 --- a/target/product/treble_common.mk +++ b/target/product/treble_common.mk @@ -66,6 +66,12 @@ PRODUCT_PACKAGES += \ 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 \