commit b1ebdae78e1a75b67246c16cd5b9cf1a52447e78
author Martijn Coenen <maco@google.com> Thu Sep 29 13:49:24 2016 +0200
committer Martijn Coenen <maco@google.com> Thu Sep 29 13:59:35 2016 +0200
tree 00f116a1a20315bb017fde0a42ea109225c55ee9
parent 707ada78f39a1331b5267103ce921234d6151a06

Switch bullhead to default Treble NFC HAL.

Bug: b/31688271
Test: NFC works.
Change-Id: Icaedf6a134273449695560f21a39a72878f2ece9

device.mk

diff --git a/device.mk b/device.mk
index 1a21a2b..f3b6298 100644
--- a/device.mk
+++ b/device.mk
@@ -222,14 +222,19 @@
 # NFC packages
 PRODUCT_PACKAGES += \
     NfcNci \
-    Tag
+    Tag \
+    nfc_nci.bullhead \
+    android.hardware.nfc@1.0-impl \
 
+ifeq ($(ENABLE_TREBLE), true)
+PRODUCT_PACKAGES += \
+    android.hardware.nfc@1.0-service
+endif
+
+# TODO(b/31817599) remove when bullhead_treble goes away
 ifeq ($(TARGET_PRODUCT), bullhead_treble)
 PRODUCT_PACKAGES += \
-    nfc_hal_pn54x
-else
-PRODUCT_PACKAGES += \
-    nfc_nci.bullhead
+    android.hardware.nfc@1.0-service
 endif
 
 # Fingerprint Sensor