From e4d02b86f5a2b8d64570df4625636afb621c702d Mon Sep 17 00:00:00 2001 From: Anton Hansson Date: Mon, 22 Oct 2018 15:33:13 +0100 Subject: [PATCH] Move libnfc-nci.conf to /product on wahoo Device-specific files belong off /system. Bug: 117878616 Test: make Change-Id: I012a64dda5e8dbb5506a98e6c569bb1218b18e84 --- CleanSpec.mk | 2 ++ device.mk | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CleanSpec.mk b/CleanSpec.mk index aa65532f..0819c55d 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -192,3 +192,5 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/etc/init/healthd.rc) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/bin/hw/android.hardware.keymaster@4.0-service) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/etc/init/android.hardware.keymaster@4.0-service.rc) +# Move libnfc-nci.conf to /vendor +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/etc/libnfc-nci.conf) diff --git a/device.mk b/device.mk index 069e35b7..8ad34c67 100755 --- a/device.mk +++ b/device.mk @@ -380,7 +380,7 @@ PRODUCT_PACKAGES += \ SecureElement PRODUCT_COPY_FILES += \ - device/google/wahoo/nfc/libnfc-nci.conf:$(TARGET_COPY_OUT_SYSTEM)/etc/libnfc-nci.conf \ + device/google/wahoo/nfc/libnfc-nci.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf \ PRODUCT_PACKAGES += \ android.hardware.usb@1.1-service.wahoo