commit e45490f77826eee306c9e56374fbd5856e8dae1b
author Martijn Coenen <maco@google.com> Fri Oct 07 19:25:07 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Oct 07 19:25:07 2016 +0000
tree 583c792aba0338b807a38b255792cb67e79f2d46
parent e57d43c7e76aed5115a68e8566344d096a7a9172
parent 48f4ecdf4bcc84e7e4b73615567b9a4650a2805c

Merge "Shamu: NFC: Add default implementation." am: bfb13347ec am: 41f6baa74f
am: 48f4ecdf4b

Change-Id: I3cca2bd9abe4a0fc816fbd1f4063e4ec69c073bd

device.mk

diff --git a/device.mk b/device.mk
index c422f9e..c8993ab 100644
--- a/device.mk
+++ b/device.mk
@@ -290,7 +290,13 @@
 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 \