commit e8712cc5c12be607d1c5bef6ef6662551a30892e
author George Chang <georgekgchang@google.com> Wed Mar 30 22:13:09 2022 +0800
committer George Chang <georgekgchang@google.com> Wed Jun 01 06:19:38 2022 +0000
tree b8c278f43e415b17c741685d8104db26d3fee146
parent 084c4cd31bfa55dbe7abd788693e491053aa0ebb

Switch NFC from HIDL to AIDL

Bug: 216290344
Test: atest NfcNciInstrumentationTests
Test: atest VtsAidlHalNfcTargetTest
Merged-In: Ifde6ab418a18a10b11911cd2e8459f769587f685
Change-Id: Ifde6ab418a18a10b11911cd2e8459f769587f685

device-oriole.mk

diff --git a/device-oriole.mk b/device-oriole.mk
index ee728c3..5a5ab27 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -117,7 +117,7 @@
 PRODUCT_PACKAGES += \
 	NfcNci \
 	Tag \
-	android.hardware.nfc@1.2-service.st
+	android.hardware.nfc-service.st
 
 # SecureElement
 PRODUCT_PACKAGES += \
@@ -131,7 +131,6 @@
 	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
 
 # Vibrator HAL