From 61abf7319e10837fcb0868cad3807b8a502cb80b Mon Sep 17 00:00:00 2001 From: Roshan Pius Date: Fri, 1 Dec 2023 19:19:56 +0000 Subject: [PATCH] Revert^2 "pantah: Replace NFC app with NFC apex" 3000cdee0ef5284ba9fdc68bcdebedbcceb65b10 Bug: 303286040 Test: Compiles (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:aa3c94e272d388cc559f58faabb85caa2eeef48e) Merged-In: I4da74311505445715132b84afb557ec7e126abac Change-Id: I4da74311505445715132b84afb557ec7e126abac Change-Id: I39f927d3cee2ec84616ecb56704fc2b5d4d4896e --- device-cheetah.mk | 2 +- device-cloudripper.mk | 2 +- device-panther.mk | 2 +- device-ravenclaw.mk | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/device-cheetah.mk b/device-cheetah.mk index 01e0dd3..e7b42ee 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -115,7 +115,7 @@ PRODUCT_COPY_FILES += \ endif PRODUCT_PACKAGES += \ - NfcNci \ + $(RELEASE_PACKAGE_NFC_STACK) \ Tag \ android.hardware.nfc-service.st diff --git a/device-cloudripper.mk b/device-cloudripper.mk index 0a4dfc1..6abb728 100644 --- a/device-cloudripper.mk +++ b/device-cloudripper.mk @@ -69,7 +69,7 @@ PRODUCT_COPY_FILES += \ endif PRODUCT_PACKAGES += \ - NfcNci \ + $(RELEASE_PACKAGE_NFC_STACK) \ Tag \ android.hardware.nfc-service.st diff --git a/device-panther.mk b/device-panther.mk index dde9314..36253be 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -94,7 +94,7 @@ PRODUCT_COPY_FILES += \ endif PRODUCT_PACKAGES += \ - NfcNci \ + $(RELEASE_PACKAGE_NFC_STACK) \ Tag \ android.hardware.nfc-service.st diff --git a/device-ravenclaw.mk b/device-ravenclaw.mk index b3607e7..0f3af6d 100644 --- a/device-ravenclaw.mk +++ b/device-ravenclaw.mk @@ -66,7 +66,7 @@ PRODUCT_COPY_FILES += \ device/google/pantah/nfc/libnfc-nci.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf PRODUCT_PACKAGES += \ - NfcNci \ + $(RELEASE_PACKAGE_NFC_STACK) \ Tag \ android.hardware.nfc-service.st