exynos9610: build libbt-vendor

Change-Id: I40f69d4bcd3c1a77ea38022837045e988807dad0

diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 117b582686771e7e22b36cbe25ee9dbd696eff21..452bd3f941b980503ee2c832a078f2f066ad8a19 100644 (file)
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -19,6 +19,8 @@ COMMON_PATH := device/motorola/exynos9610-common
 # Include path
 TARGET_SPECIFIC_HEADER_PATH := $(COMMON_PATH)/include
 
+BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := hardware/samsung_slsi/libbt/include
+
 # Platform
 TARGET_BOARD_PLATFORM := exynos5
 TARGET_SOC := exynos9610
@@ -103,6 +105,8 @@ BOARD_HOSTAPD_PRIVATE_LIB        := lib_driver_cmd_slsi
 WIFI_HIDL_FEATURE_AWARE          := true
 WIFI_HIDL_FEATURE_DUAL_INTERFACE := true
 
+BOARD_HAVE_BLUETOOTH_SLSI := true
+
 # Properties
 BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true
 

diff --git a/common.mk b/common.mk
index 582fd3922b5550e1b74d036091dfec4a649c2b29..7dcf29b89fe3c1b2a87383d289f2badabef521fd 100644 (file)
--- a/common.mk
+++ b/common.mk
@@ -68,6 +68,13 @@ PRODUCT_PACKAGES += \
 PRODUCT_PACKAGES += \
     otapreopt_script
 
+# Bluetooth
+PRODUCT_COPY_FILES += \
+    hardware/samsung_slsi/libbt/conf/bt_did.conf:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth/bt_did.conf
+
+PRODUCT_PACKAGES += \
+    libbt-vendor
+
 # Boot animation
 TARGET_BOOTANIMATION_PRELOAD := true
 TARGET_BOOTANIMATION_TEXTURE_CACHE := true

diff --git a/proprietary-files-vendor.txt b/proprietary-files-vendor.txt
index 0640092871eba6066b9b016241d43790ce4b6430..268153685676428cc1ba28a3929fc4f691bc50bd 100644 (file)
--- a/proprietary-files-vendor.txt
+++ b/proprietary-files-vendor.txt
@@ -101,10 +101,6 @@ vendor/lib64/soundfx/libswdap.so
 vendor/lib64/vendor.dolby.hardware.dms@1.0-impl.so
 vendor/lib64/vendor.dolby.hardware.dms@1.0.so
 
-# bluetooth
-vendor/etc/bluetooth/bt_did.conf
-vendor/etc/bt_stack_level6.conf
-
 # camera
 vendor/lib/libENF.so
 vendor/lib/libexynoscamera_hifi_plugin.so