summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartijn Coenen <maco@google.com>2016-10-07 19:17:05 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-10-07 19:17:05 +0000
commit41f6baa74fb554285d0ee18b5f747b1ec6057e4d (patch)
treeddb9b8d8faf1730f00724dd34571a703ec7a0bbc
parent51cdd4df50ca506d84d612bf4030a8f0e6265fc0 (diff)
parentbfb13347ec2f0f8a2b842e42b23f28aa5dd66ab1 (diff)
downloadshamu-41f6baa74fb554285d0ee18b5f747b1ec6057e4d.tar.gz
Merge "Shamu: NFC: Add default implementation."
am: bfb13347ec Change-Id: I77b5c4f07351d3cf1528e18ad504204210b47557
-rw-r--r--device.mk8
1 files changed, 7 insertions, 1 deletions
diff --git a/device.mk b/device.mk
index 81eaf655..9c2ed015 100644
--- a/device.mk
+++ b/device.mk
@@ -290,7 +290,13 @@ PRODUCT_PACKAGES += \
PRODUCT_PACKAGES += \
nfc_nci.bcm2079x.default \
NfcNci \
- Tag
+ Tag \
+ android.hardware.nfc@1.0-impl
+
+ifeq ($(ENABLE_TREBLE), true)
+PRODUCT_PACKAGES += \
+ android.hardware.nfc@1.0-service
+endif
PRODUCT_COPY_FILES += \
frameworks/native/data/etc/android.hardware.nfc.xml:system/etc/permissions/android.hardware.nfc.xml \