Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d0935e46 authored by Yo Chiang's avatar Yo Chiang Committed by Automerger Merge Worker
Browse files

Merge "Remove default GSI libnfc-nci.conf" am: 22940097 am: b1f03ab7 

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

Change-Id: I0c7a1a306edb314e52bf3c50cfd6727b97889d04
parents d43c8c83 b1f03ab7

target/board/generic/device.mk

+0 −9
Original line number Diff line number Diff line
@@ -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

target/product/aosp_product.mk

+0 −5
Original line number Diff line number Diff line
@@ -38,8 +38,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