Merge remote-tracking branch 'x86/nougat-x86' into oreo-x86

[android-x86/device-generic-common.git] / treble.mk

diff --git a/treble.mk b/treble.mk
index b25e89b..95cb842 100644 (file)
--- a/treble.mk
+++ b/treble.mk
@@ -17,15 +17,13 @@ PRODUCT_PACKAGES += \
 
 # Bluetooth HAL
 PRODUCT_PACKAGES += \
-    android.hardware.bluetooth@1.0-impl \
-    android.hardware.bluetooth@1.0-service \
-    libbt-vendor
+    android.hardware.bluetooth@1.0-service.btlinux
 
 # Camera HAL
-#PRODUCT_PACKAGES += \
+PRODUCT_PACKAGES += \
     camera.device@3.2-impl \
     android.hardware.camera.provider@2.4-impl \
-#   android.hardware.camera.provider@2.4-service
+    android.hardware.camera.provider@2.4-service
 
 # DumpState HAL
 PRODUCT_PACKAGES += \
@@ -46,7 +44,8 @@ PRODUCT_PACKAGES += \
 
 # Light HAL
 PRODUCT_PACKAGES += \
-    android.hardware.light@2.0-impl
+    android.hardware.light@2.0-impl \
+    android.hardware.light@2.0-service
 
 # Memtrack HAL
 #PRODUCT_PACKAGES += \