summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoshan Pius <rpius@google.com>2023-12-11 22:40:04 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-12-11 22:40:04 +0000
commit1af0f043785c3e85adb4c0630153eec246b1e9ad (patch)
treedefae34c1deea6ea7bacfe15ea264e48df9e0713
parentabfb39adfdd1e4db0165ef6e273cf5bab6ccc12a (diff)
parent3dbc00c7f95a97b58c0f94036e8043925fa78f8a (diff)
downloadraviole-1af0f043785c3e85adb4c0630153eec246b1e9ad.tar.gz
Revert^2 "raven: Replace NFC app with NFC apex" am: c06d03fde9 am: 3dbc00c7f9
Original change: https://android-review.googlesource.com/c/device/google/raviole/+/2863348 Change-Id: I0e6d45c0d03cce78af926b40cf331ee3963510a4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--device-oriole.mk2
-rw-r--r--device-raven.mk2
-rw-r--r--device-slider.mk2
-rw-r--r--device-whitefin.mk2
4 files changed, 4 insertions, 4 deletions
diff --git a/device-oriole.mk b/device-oriole.mk
index db1dca86..344a20b8 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -133,7 +133,7 @@ PRODUCT_COPY_FILES += \
device/google/raviole/nfc/libnfc-nci.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf
PRODUCT_PACKAGES += \
- NfcNci \
+ $(RELEASE_PACKAGE_NFC_STACK) \
Tag \
android.hardware.nfc-service.st
diff --git a/device-raven.mk b/device-raven.mk
index c01f8384..c69ecaf9 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -140,7 +140,7 @@ PRODUCT_COPY_FILES += \
device/google/raviole/nfc/libnfc-nci-raven.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf
PRODUCT_PACKAGES += \
- NfcNci \
+ $(RELEASE_PACKAGE_NFC_STACK) \
Tag \
android.hardware.nfc-service.st
diff --git a/device-slider.mk b/device-slider.mk
index 5cbab35d..58643162 100644
--- a/device-slider.mk
+++ b/device-slider.mk
@@ -83,7 +83,7 @@ PRODUCT_COPY_FILES += \
device/google/raviole/nfc/libnfc-nci.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf
PRODUCT_PACKAGES += \
- NfcNci \
+ $(RELEASE_PACKAGE_NFC_STACK) \
Tag \
android.hardware.nfc-service.st
diff --git a/device-whitefin.mk b/device-whitefin.mk
index 0c366c81..c6c94e85 100644
--- a/device-whitefin.mk
+++ b/device-whitefin.mk
@@ -79,7 +79,7 @@ PRODUCT_COPY_FILES += \
device/google/raviole/nfc/libnfc-nci.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf
PRODUCT_PACKAGES += \
- NfcNci \
+ $(RELEASE_PACKAGE_NFC_STACK) \
Tag \
android.hardware.nfc-service.st