From c06d03fde9648490e92c10e43cf4635cdd2c2b2c Mon Sep 17 00:00:00 2001 From: Roshan Pius Date: Fri, 1 Dec 2023 19:19:56 +0000 Subject: [PATCH] Revert^2 "raven: Replace NFC app with NFC apex" c0c4781f17b3804c708ca3630d4c1161d5152b70 Bug: 303286040 Test: Compiles (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:cd3dd4d199ea3c5786da12199c6dc9c28a65ebf1) Merged-In: I51a882988a933836ebf9426c4a6548ee3a97aa42 Change-Id: I51a882988a933836ebf9426c4a6548ee3a97aa42 Change-Id: I08f657b18837a7910afebc3eaf87193c07f94513 --- device-oriole.mk | 2 +- device-raven.mk | 2 +- device-slider.mk | 2 +- device-whitefin.mk | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/device-oriole.mk b/device-oriole.mk index 2184715..358ce0a 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -133,7 +133,7 @@ PRODUCT_COPY_FILES += \ device/google/raviole/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 diff --git a/device-raven.mk b/device-raven.mk index 8ebde0c..12c9c99 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -148,7 +148,7 @@ PRODUCT_COPY_FILES += \ endif PRODUCT_PACKAGES += \ - NfcNci \ + $(RELEASE_PACKAGE_NFC_STACK) \ Tag \ android.hardware.nfc-service.st diff --git a/device-slider.mk b/device-slider.mk index 5cbab35..5864316 100644 --- a/device-slider.mk +++ b/device-slider.mk @@ -83,7 +83,7 @@ PRODUCT_COPY_FILES += \ device/google/raviole/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 diff --git a/device-whitefin.mk b/device-whitefin.mk index 0c366c8..c6c94e8 100644 --- a/device-whitefin.mk +++ b/device-whitefin.mk @@ -79,7 +79,7 @@ PRODUCT_COPY_FILES += \ device/google/raviole/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