commit 73a68dea0f502ed05f58841528b59a1a44a446ec
author Roshan Pius <rpius@google.com> Mon Oct 16 18:31:02 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Oct 16 18:31:02 2023 +0000
tree 0b1c79478aaf89c68d32e9ce861c7a72315cbddc
parent 4a96299e453e87de9cdaa6bcae451c952212f310
parent 7ccd686ef789aaaad1396d6d351acbf320a40ca9

Merge "raven: Replace NFC app with NFC apex" into main

device-oriole.mk

diff --git a/device-oriole.mk b/device-oriole.mk
index 2184715..e9c757e 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -133,7 +133,7 @@
 	device/google/raviole/nfc/libnfc-nci.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf
 
 PRODUCT_PACKAGES += \
-	NfcNci \
+	com.android.nfcservices \
 	Tag \
 	android.hardware.nfc-service.st
 

device-raven.mk

diff --git a/device-raven.mk b/device-raven.mk
index 8ebde0c..f0db991 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -148,7 +148,7 @@
 endif
 
 PRODUCT_PACKAGES += \
-	NfcNci \
+	com.android.nfcservices \
 	Tag \
 	android.hardware.nfc-service.st
 

device-slider.mk

diff --git a/device-slider.mk b/device-slider.mk
index 5cbab35..5f2a741 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 \
+	com.android.nfcservices \
 	Tag \
 	android.hardware.nfc-service.st
 

device-whitefin.mk

diff --git a/device-whitefin.mk b/device-whitefin.mk
index 0c366c8..090b93e 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 \
+	com.android.nfcservices \
 	Tag \
 	android.hardware.nfc-service.st