commit | 538d828d2165ee0521ff5d590bd045431fedae1e | [log] [tgz] |
---|---|---|
author | Treehugger Robot <[email protected]> | Mon Dec 11 22:18:14 2023 +0000 |
committer | Automerger Merge Worker <[email protected]> | Mon Dec 11 22:18:14 2023 +0000 |
tree | e36ce9a5272b2fd66685b965222b5a06b8f55b8f | |
parent | 6b6955ca71209b5c8db2fbbeff8f86ed30952157 [diff] | |
parent | f9a52d87c5a0ac94827eaf29f2d3c996fe0acf9d [diff] |
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 <[email protected]>
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 @@ 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