commit dacb40f43149b911a2fcdb7cef96aa59aff02b6b
author Myles Watson <mylesgw@google.com> Thu Jan 26 14:01:37 2017 -0800
committer Myles Watson <mylesgw@google.com> Thu Jan 26 14:05:05 2017 -0800
tree b662366444e0b1ddbf86243643ac7b420b0d89bd
parent 115645c2982ab849e2b8d8c5cbf0f3f51e02b875

Include binderized HALs for Bluetooth and NFC

Remove TREBLE guards around the HAL services.

Test: build
Change-Id: Ie29c8c520feb904bd97878f0708c1120922a7708

device-common.mk

diff --git a/device-common.mk b/device-common.mk
index a220997..804414c 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -362,10 +362,8 @@
 PRODUCT_PACKAGES += \
     android.hardware.bluetooth@1.0-impl
 
-ifeq ($(ENABLE_TREBLE), true)
 PRODUCT_PACKAGES += \
     android.hardware.bluetooth@1.0-service
-endif
 
 # NFC packages
 PRODUCT_PACKAGES += \
@@ -373,10 +371,8 @@
     Tag  \
     android.hardware.nfc@1.0-impl
 
-ifeq ($(ENABLE_TREBLE), true)
 PRODUCT_PACKAGES += \
 	android.hardware.nfc@1.0-service
-endif
 
 # Library used for VTS tests  (only for userdebug and eng builds)
 ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))