From dcfa6013749df7717124be69f6ece4403c621ebc Mon Sep 17 00:00:00 2001 From: Yo Chiang Date: Tue, 2 Jun 2020 16:33:55 +0800 Subject: [PATCH] Remove default GSI libnfc-nci.conf libnfc-nci.so provides a default config at /system/etc/libnfc-nci.conf. Remove /system/etc/libnfc-nci.conf PRODUCT_COPY_FILES entries from aosp_product.mk and board/generic/device.mk. Bug: 157704723 Test: Build gsi. /system/etc/libnfc-nci.conf is installed. Test: Flash gsi. Check logcat and NFC still works. Test: Toggle NFC on/off and /etc/libnfc-nci.conf is loaded. Test: Build aosp_bonito. Both /(system|product)/etc/libnfc-nci.conf are installed. Test: Flash aosp_bonito. Check logcat and NFC still works. Test: Toggle NFC on/off and /product/etc/libnfc-nci.conf is loaded. Change-Id: Id119a88a10b549e1fd475cf9b14b18410923011b --- target/board/generic/device.mk | 9 --------- target/product/aosp_product.mk | 5 ----- 2 files changed, 14 deletions(-) diff --git a/target/board/generic/device.mk b/target/board/generic/device.mk index cfb15f065..76242c90b 100644 --- a/target/board/generic/device.mk +++ b/target/board/generic/device.mk @@ -16,12 +16,3 @@ PRODUCT_SOONG_NAMESPACES += device/generic/goldfish # for libwifi-hal-emu PRODUCT_SOONG_NAMESPACES += device/generic/goldfish-opengl # for goldfish deps. - -# NFC: -# Provide default libnfc-nci.conf file for devices that does not have one in -# vendor/etc because aosp system image (of aosp_$arch products) is going to -# be used as GSI. -# May need to remove the following for newly launched devices in P since this -# NFC configuration file should be in vendor/etc, instead of system/etc -PRODUCT_COPY_FILES += \ - device/generic/common/nfc/libnfc-nci.conf:system/etc/libnfc-nci.conf diff --git a/target/product/aosp_product.mk b/target/product/aosp_product.mk index 9b9ccb144..f22c3a31f 100644 --- a/target/product/aosp_product.mk +++ b/target/product/aosp_product.mk @@ -37,8 +37,3 @@ PRODUCT_PACKAGES += \ # Provide a APN configuration to GSI product PRODUCT_COPY_FILES += \ device/sample/etc/apns-full-conf.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/apns-conf.xml - -# NFC: -# Provide a libnfc-nci.conf to GSI product -PRODUCT_COPY_FILES += \ - device/generic/common/nfc/libnfc-nci.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf