From 2b80687bd54ea455747e83e3718935266cf24107 Mon Sep 17 00:00:00 2001 From: Roshan Pius Date: Sat, 4 Nov 2023 14:58:26 +0000 Subject: [PATCH] Revert "caimito: 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 Change-Id: Ibb9aa5111e7157634fc5afec21c8c3e9530149e5 Test: Compiles, device boots up --- device-caiman.mk | 2 +- device-komodo.mk | 2 +- device-ripcurrent24.mk | 2 +- device-ripcurrentpro.mk | 2 +- device-tokay.mk | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/device-caiman.mk b/device-caiman.mk index ff09f4d7..b6ab794d 100644 --- a/device-caiman.mk +++ b/device-caiman.mk @@ -72,7 +72,7 @@ PRODUCT_COPY_FILES += \ device/google/caimito/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-komodo.mk b/device-komodo.mk index a28b1cc2..22cbdaa8 100644 --- a/device-komodo.mk +++ b/device-komodo.mk @@ -83,7 +83,7 @@ PRODUCT_COPY_FILES += \ device/google/caimito/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-ripcurrent24.mk b/device-ripcurrent24.mk index 50f37880..968ca404 100644 --- a/device-ripcurrent24.mk +++ b/device-ripcurrent24.mk @@ -65,7 +65,7 @@ PRODUCT_COPY_FILES += \ device/google/caimito/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-ripcurrentpro.mk b/device-ripcurrentpro.mk index dffdbdda..9034573a 100644 --- a/device-ripcurrentpro.mk +++ b/device-ripcurrentpro.mk @@ -67,7 +67,7 @@ PRODUCT_COPY_FILES += \ device/google/caimito/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-tokay.mk b/device-tokay.mk index 9af1a1f0..9e03dfa6 100644 --- a/device-tokay.mk +++ b/device-tokay.mk @@ -74,7 +74,7 @@ PRODUCT_COPY_FILES += \ device/google/caimito/nfc/libnfc-nci.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf PRODUCT_PACKAGES += \ - com.android.nfcservices \ + NfcNci \ Tag \ android.hardware.nfc-service.st