commit 0ce0a1d8e593a5615e50cf114e6ac3f276e12c26
author Anton Hansson <hansson@google.com> Mon Oct 22 15:33:51 2018 +0100
committer Anton Hansson <hansson@google.com> Mon Oct 22 18:06:19 2018 +0100
tree 3649c4f617969ea610f8842e1d7c273a91610512
parent 5c6a352ecd3a281da2fa09e1fb970def032d11c9

Move libnfc-nci.conf to /product on marlin/sailfish

Device-specific files belong off /system.

Bug: 117878616
Test: make
Change-Id: Iddad62c178c553e4d628deb4509ea54451b8ab4f

CleanSpec.mk

diff --git a/CleanSpec.mk b/CleanSpec.mk
index e1b0ca0..0781ffc 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -110,3 +110,6 @@
 
 # Migrate to versioned VNDK directory layout
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/vndk-sp)
+
+# Move libnfc-nci.conf to /vendor
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/etc/libnfc-nci.conf)

device-common.mk

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