commit 79e1b6e6097e7d83dbbaeed1eebef7e5b6e0fbd5
author Ruchi Kandoi <kandoiruchi@google.com> Thu Mar 01 14:09:08 2018 -0800
committer Ruchi Kandoi <kandoiruchi@google.com> Fri Mar 09 22:17:19 2018 +0000
tree c397598cc458ea4d3355d713d016c57affef4d80
parent 4d013a42f42d39d5812bb4e49f88403272eb0968

Remove system and vendor image dependency

libnfc-nci.conf shouldn't be a part of vendor image, since it is
accessed by libnfc-nci and Nfc application, both are part of system
image.

Test: Nfc enable/disable
Bug: 72080121
Merged-In: I03b6387afc35a521c8a6f9fea1ec2e649d56a38f
Change-Id: I03b6387afc35a521c8a6f9fea1ec2e649d56a38f

device-common.mk

diff --git a/device-common.mk b/device-common.mk
index afc82d1..1516c1e 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -509,7 +509,7 @@
     ro.camera.notify_nfc=1
 
 PRODUCT_COPY_FILES += \
-    device/google/marlin/nfc/libnfc-nci.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-nci.conf \
+    device/google/marlin/nfc/libnfc-nci.conf:$(TARGET_COPY_OUT_SYSTEM)/etc/libnfc-nci.conf \
     device/google/marlin/nfc/libpn551_fw.so:$(TARGET_COPY_OUT_VENDOR)/firmware/libpn551_fw.so
 
 # Bootloader HAL used for A/B updates.