Merge "pantah: Replace NFC app with NFC apex" into main am: 6ae13c6320 am: ec0193c9ee am: 971a47ea0f am: 23fa369afa

Original change: https://android-review.googlesource.com/c/device/google/pantah/+/2779408

Change-Id: I0d01d8cc71f8ff31653240dddc10124c6601f17d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Roshan Pius 2023-10-16 20:49:16 +00:00 committed by Automerger Merge Worker
commit da5716b0c2
4 changed files with 4 additions and 4 deletions

View file

@ -108,7 +108,7 @@ PRODUCT_COPY_FILES += \
device/google/pantah/nfc/libnfc-nci-cheetah.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf device/google/pantah/nfc/libnfc-nci-cheetah.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
NfcNci \ com.android.nfcservices \
Tag \ Tag \
android.hardware.nfc-service.st android.hardware.nfc-service.st

View file

@ -62,7 +62,7 @@ PRODUCT_COPY_FILES += \
device/google/pantah/nfc/libnfc-nci.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf device/google/pantah/nfc/libnfc-nci.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
NfcNci \ com.android.nfcservices \
Tag \ Tag \
android.hardware.nfc-service.st android.hardware.nfc-service.st

View file

@ -87,7 +87,7 @@ PRODUCT_COPY_FILES += \
device/google/pantah/nfc/libnfc-nci-panther.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf device/google/pantah/nfc/libnfc-nci-panther.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
NfcNci \ com.android.nfcservices \
Tag \ Tag \
android.hardware.nfc-service.st android.hardware.nfc-service.st

View file

@ -66,7 +66,7 @@ PRODUCT_COPY_FILES += \
device/google/pantah/nfc/libnfc-nci.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf device/google/pantah/nfc/libnfc-nci.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
NfcNci \ com.android.nfcservices \
Tag \ Tag \
android.hardware.nfc-service.st android.hardware.nfc-service.st