StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove default GSI libnfc-nci.conf" am: 2294009766 am: b1f03ab796

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/+/1322636

Change-Id: I0c7a1a306edb314e52bf3c50cfd6727b97889d04
This commit is contained in:
Yo Chiang
2020-06-12 03:11:30 +00:00
committed by Automerger Merge Worker
parent d43c8c83bc b1f03ab796
commit d0935e46f5
2 changed files with 0 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
target/board/generic/device.mk
View File

@@ -16,12 +16,3 @@
PRODUCT_SOONG_NAMESPACES += device/generic/goldfish # for libwifi-hal-emu PRODUCT_SOONG_NAMESPACES += device/generic/goldfish # for libwifi-hal-emu
PRODUCT_SOONG_NAMESPACES += device/generic/goldfish-opengl # for goldfish deps. 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

5
target/product/aosp_product.mk
View File

@@ -38,8 +38,3 @@ PRODUCT_PACKAGES += \
# Provide a APN configuration to GSI product # Provide a APN configuration to GSI product
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \
device/sample/etc/apns-full-conf.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/apns-conf.xml 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