summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com>2023-12-11 22:18:14 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-12-11 22:18:14 +0000
commit538d828d2165ee0521ff5d590bd045431fedae1e (patch)
treee36ce9a5272b2fd66685b965222b5a06b8f55b8f
parent6b6955ca71209b5c8db2fbbeff8f86ed30952157 (diff)
parentf9a52d87c5a0ac94827eaf29f2d3c996fe0acf9d (diff)
downloadfelix-538d828d2165ee0521ff5d590bd045431fedae1e.tar.gz
Merge "Revert^2 "felix: Replace NFC app with NFC apex"" into main am: f9a52d87c5
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2863566 Change-Id: I5e83b610bcba6efca110e5248febe30b65632fa9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--device-felix.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/device-felix.mk b/device-felix.mk
index 634b381..e7d2e12 100644
--- a/device-felix.mk
+++ b/device-felix.mk
@@ -97,7 +97,7 @@ PRODUCT_COPY_FILES += \
device/google/felix/nfc/libnfc-nci-felix.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf
PRODUCT_PACKAGES += \
- NfcNci \
+ $(RELEASE_PACKAGE_NFC_STACK) \
Tag \
android.hardware.nfc-service.st \
NfcOverlayFelix