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

am: 1988d976ec

Change-Id: I729cd256adbf7681f4ed988d28427ed66025772e
This commit is contained in:
Justin Yun 2018-03-13 01:09:22 +00:00 committed by android-build-merger
commit 46d5776509
1 changed files with 6 additions and 0 deletions
target/product

View File

@ -70,6 +70,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 \