Revert "raven: Replace NFC app with NFC apex" am: 84b70f6ffc
Original change: https://android-review.googlesource.com/c/device/google/raviole/+/2817934
Change-Id: I113794f6a77439d33351b8b9cb6657c74936c049
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/device-oriole.mk b/device-oriole.mk
index 6ee8184..a36baa4 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 += \
- com.android.nfcservices \
+ NfcNci \
Tag \
android.hardware.nfc-service.st \
NfcOverlayOriole
diff --git a/device-raven.mk b/device-raven.mk
index 56ad838..ab97b3b 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -148,7 +148,7 @@
endif
PRODUCT_PACKAGES += \
- com.android.nfcservices \
+ NfcNci \
Tag \
android.hardware.nfc-service.st \
NfcOverlayRaven
diff --git a/device-slider.mk b/device-slider.mk
index 5f2a741..5cbab35 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 += \
- com.android.nfcservices \
+ NfcNci \
Tag \
android.hardware.nfc-service.st
diff --git a/device-whitefin.mk b/device-whitefin.mk
index 090b93e..0c366c8 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 += \
- com.android.nfcservices \
+ NfcNci \
Tag \
android.hardware.nfc-service.st