commit 4053823d4a03b825fc64d902d1e7aa48a5851020
author George Chang <georgekgchang@google.com> Fri Apr 29 15:53:03 2022 +0000
committer George Chang <georgekgchang@google.com> Fri Apr 29 15:53:03 2022 +0000
tree caa92f841f23e036c9fdc17da67d61b7aa317698
parent 4ffd90e138f7a4d9eee180c372d912043ec57336

Revert "Switch NFC from HIDL to AIDL"

This reverts commit 4ffd90e138f7a4d9eee180c372d912043ec57336.

Reason for revert: Broken tests
Bug: 230834308

Change-Id: I93f632ed8c489300e10c1acd870fa142ba55ae6e

device-slider.mk

diff --git a/device-slider.mk b/device-slider.mk
index 631ee09..647ee73 100644
--- a/device-slider.mk
+++ b/device-slider.mk
@@ -84,7 +84,7 @@
 PRODUCT_PACKAGES += \
 	NfcNci \
 	Tag \
-	android.hardware.nfc-service.st
+	android.hardware.nfc@1.2-service.st
 
 # SecureElement
 PRODUCT_PACKAGES += \
@@ -97,6 +97,7 @@
 	device/google/raviole/nfc/libse-gto-hal2.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal2.conf
 
 DEVICE_MANIFEST_FILE += \
+	device/google/raviole/nfc/manifest_nfc.xml \
 	device/google/raviole/nfc/manifest_se.xml
 
 # PowerStats HAL