commit 176272f9fa57c7d6519797320a3b037db70e7a93
author Steven Moreland <smoreland@google.com> Fri Jan 27 14:25:05 2017 -0800
committer Steven Moreland <smoreland@google.com> Fri Jan 27 17:15:40 2017 -0800
tree a41652e5db805874650c0ebb4b625bb53fcc47eb
parent 8ef7815f45408f8326bfe56eaa37c6f6f424829e

Fixing two merge resolution conflicts.

ag/1837539 and its revert ag/1841065 should have restored master to the
same state as after ag/1835881

Test: nfc works with persist.hal.binderization on or off
Change-Id: I62ebc14a79de9d912be5ab06794dd206a31919b5

device-common.mk

diff --git a/device-common.mk b/device-common.mk
index 875484b..725c044 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -112,6 +112,7 @@
 # TODO(b/34258263): will marlin/sailfish be binderized devices?
 PRODUCT_PACKAGES += \
     android.hardware.light@2.0-service \
+    android.hardware.nfc@1.0-service
 
 # Light HAL
 PRODUCT_PACKAGES += \
@@ -444,11 +445,6 @@
     Tag \
     android.hardware.nfc@1.0-impl
 
-ifeq ($(ENABLE_TREBLE), true)
-PRODUCT_PACKAGES += \
-    android.hardware.nfc@1.0-service
-endif
-
 # Thermal HAL
 PRODUCT_PACKAGES += \
     android.hardware.thermal@1.0-impl