commit cd3dd4d199ea3c5786da12199c6dc9c28a65ebf1
author Roshan Pius <rpius@google.com> Fri Dec 01 19:19:56 2023 +0000
committer Roshan Pius <rpius@google.com> Mon Dec 04 11:54:37 2023 -0800
tree f24b59650c039f09a82a6a2de5d9dfa6f651c2ce
parent 69cf853ced785069b4d3adf00a1d3ee0e510a733

Revert^2 "raven: Replace NFC app with NFC apex"

c0c4781f17b3804c708ca3630d4c1161d5152b70

Bug: 303286040
Test: Compiles

Change-Id: I51a882988a933836ebf9426c4a6548ee3a97aa42

device-oriole.mk

diff --git a/device-oriole.mk b/device-oriole.mk
index c47befc..bd05f49 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -146,7 +146,7 @@
 	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
 

device-raven.mk

diff --git a/device-raven.mk b/device-raven.mk
index 59cd0ba..423e753 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -152,7 +152,7 @@
 	device/google/raviole/nfc/libnfc-nci-raven.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf
 
 PRODUCT_PACKAGES += \
-	NfcNci \
+	$(RELEASE_PACKAGE_NFC_STACK) \
 	Tag \
 	android.hardware.nfc-service.st
 

device-slider.mk

diff --git a/device-slider.mk b/device-slider.mk
index 359ee56..c0b67fa 100644
--- a/device-slider.mk
+++ b/device-slider.mk
@@ -83,7 +83,7 @@
 	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
 

device-whitefin.mk

diff --git a/device-whitefin.mk b/device-whitefin.mk
index 2063c90..5161208 100644
--- a/device-whitefin.mk
+++ b/device-whitefin.mk
@@ -79,7 +79,7 @@
 	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