Revert "raven: Replace NFC app with NFC apex"
Revert submission 24993894-cherrypicker-L80100000963393177:N49200001411943056
Reason for revert: Causing bootloop with signed builds
Reverted changes: /q/submissionid:24993894-cherrypicker-L80100000963393177:N49200001411943056
Bug: 309117462
Test: Compiles, device boots up
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:c0c4781f17b3804c708ca3630d4c1161d5152b70)
Merged-In: I9298ad5be151b96e3b77301490feb8aaee3231b1
Change-Id: I9298ad5be151b96e3b77301490feb8aaee3231b1
diff --git a/device-oriole.mk b/device-oriole.mk
index ebca249..72fa60c 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 c5830f9..093b10f 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