Merge "Revert^2 "felix: Replace NFC app with NFC apex"" into main am: f9a52d87c5 am: 538d828d21

Original change: https://android-review.googlesource.com/c/device/google/felix/+/2863566

Change-Id: I9c551a4e1b0124759e506413007f8a899fe9d771
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2023-12-11 22:40:09 +00:00 committed by Automerger Merge Worker
commit ab7f3aaf73

View file

@ -97,7 +97,7 @@ PRODUCT_COPY_FILES += \
device/google/felix/nfc/libnfc-nci-felix.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf device/google/felix/nfc/libnfc-nci-felix.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
NfcNci \ $(RELEASE_PACKAGE_NFC_STACK) \
Tag \ Tag \
android.hardware.nfc-service.st \ android.hardware.nfc-service.st \
NfcOverlayFelix NfcOverlayFelix