a7xelte: Add bluetooth configuration

Change-Id: I2b437630ae9444979fdcb2e35c060f9394a67657

# Conflicts:
#	BoardConfig.mk

diff --git a/BoardConfig.mk b/BoardConfig.mk
index 3c542e38427bca9470be61bb4cd23ef5f6fbef4f..809a6535a970e0ae039501569493c776509090fd 100644 (file)
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -18,3 +18,6 @@
 include device/samsung/universal7580-common/BoardConfigCommon.mk
 
 LOCAL_PATH := device/samsung/a7xelte
+
+# Bluetooth
+BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := $(LOCAL_PATH)/bluetooth

diff --git a/bluetooth/bdroid_buildcfg.h b/bluetooth/bdroid_buildcfg.h
new file mode 100644 (file)
index 0000000..f4ef6e8
--- /dev/null
+++ b/bluetooth/bdroid_buildcfg.h
@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2012 The Android Open Source Project
+ * Copyright (C) 2014 The CyanogenMod Project <http://www.cyanogenmod.org>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef _BDROID_BUILDCFG_H
+#define _BDROID_BUILDCFG_H
+
+#define BTM_DEF_LOCAL_NAME   "Samsung Galaxy A5 (6)"
+
+#define BTM_WBS_INCLUDED        TRUE    /* Enable WBS */
+#define BTIF_HF_WBS_PREFERRED   FALSE   /* Don't use WBS by default */
+
+#define BLE_VND_INCLUDED        TRUE
+
+#endif

diff --git a/bluetooth/bt_vendor.conf b/bluetooth/bt_vendor.conf
new file mode 100644 (file)
index 0000000..ec98641
--- /dev/null
+++ b/bluetooth/bt_vendor.conf
@@ -0,0 +1,2 @@
+# Firmware patch file name
+FwPatchFileName = bcm43454_V0161.0287.hcd

diff --git a/device.mk b/device.mk
index 1ee61e58913804bee25eab31ebecc998b3fe1c55..7237808faf69999e54a82113f1ff35af179c16ca 100644 (file)
--- a/device.mk
+++ b/device.mk
@@ -18,6 +18,13 @@ LOCAL_PATH := device/samsung/a7xelte
 
 $(call inherit-product, $(SRC_TARGET_DIR)/product/languages_full.mk)
 
+# Bluetooth
+PRODUCT_COPY_FILES += \
+    $(LOCAL_PATH)/bluetooth/bt_vendor.conf:system/etc/bluetooth/bt_vendor.conf
+
+PRODUCT_PACKAGES += \
+    android.hardware.bluetooth@1.0-service
+
 # Ramdisk
 PRODUCT_PACKAGES += \
     init.target.rc