Merge "pantah: Replace NFC app with NFC apex" into main am: 6ae13c6320
am: ec0193c9ee
Original change: https://android-review.googlesource.com/c/device/google/pantah/+/2779408 Change-Id: I208f318ca2a82c2917048f291ea57bd5e630ae5b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
commit
971a47ea0f
4 changed files with 4 additions and 4 deletions
|
@ -115,7 +115,7 @@ PRODUCT_COPY_FILES += \
|
||||||
endif
|
endif
|
||||||
|
|
||||||
PRODUCT_PACKAGES += \
|
PRODUCT_PACKAGES += \
|
||||||
NfcNci \
|
com.android.nfcservices \
|
||||||
Tag \
|
Tag \
|
||||||
android.hardware.nfc-service.st
|
android.hardware.nfc-service.st
|
||||||
|
|
||||||
|
|
|
@ -69,7 +69,7 @@ PRODUCT_COPY_FILES += \
|
||||||
endif
|
endif
|
||||||
|
|
||||||
PRODUCT_PACKAGES += \
|
PRODUCT_PACKAGES += \
|
||||||
NfcNci \
|
com.android.nfcservices \
|
||||||
Tag \
|
Tag \
|
||||||
android.hardware.nfc-service.st
|
android.hardware.nfc-service.st
|
||||||
|
|
||||||
|
|
|
@ -94,7 +94,7 @@ PRODUCT_COPY_FILES += \
|
||||||
endif
|
endif
|
||||||
|
|
||||||
PRODUCT_PACKAGES += \
|
PRODUCT_PACKAGES += \
|
||||||
NfcNci \
|
com.android.nfcservices \
|
||||||
Tag \
|
Tag \
|
||||||
android.hardware.nfc-service.st
|
android.hardware.nfc-service.st
|
||||||
|
|
||||||
|
|
|
@ -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
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue