summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKeun Soo Yim <yim@google.com>2015-10-26 19:35:50 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-10-26 19:35:50 +0000
commita1481418aa69bf2f4f6f6f02dba7f4974251e095 (patch)
treea5ab5ad55a9d32232e1548e79e6a3b77c9b3ae68
parent9ac18e70df13c2723ad9a8e7460ba0129fda7a03 (diff)
parent6e49363df5d6a20a063fe003ac640f3f8efe4d78 (diff)
downloadplatform_hardware_broadcom_libbt-marshmallow-mr1-dev.tar.gz
platform_hardware_broadcom_libbt-marshmallow-mr1-dev.tar.bz2
platform_hardware_broadcom_libbt-marshmallow-mr1-dev.zip
am: 6e49363df5 * commit '6e49363df5d6a20a063fe003ac640f3f8efe4d78': libbt conf file for google gce_x86 devices
-rw-r--r--Android.mk3
-rw-r--r--conf/google/gce_x86/Android.mk14
-rw-r--r--conf/google/gce_x86/bt_vendor.conf5
3 files changed, 22 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk
index a9fd75f..37e304c 100644
--- a/Android.mk
+++ b/Android.mk
@@ -43,5 +43,8 @@ endif
ifeq ($(TARGET_PRODUCT), full_wingray)
include $(LOCAL_PATH)/conf/moto/wingray/Android.mk
endif
+ifeq ($(TARGET_PRODUCT), gce_x86_phone)
+ include $(LOCAL_PATH)/conf/google/gce_x86/Android.mk
+endif
endif # BOARD_HAVE_BLUETOOTH_BCM
diff --git a/conf/google/gce_x86/Android.mk b/conf/google/gce_x86/Android.mk
new file mode 100644
index 0000000..974e213
--- /dev/null
+++ b/conf/google/gce_x86/Android.mk
@@ -0,0 +1,14 @@
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := bt_vendor.conf
+LOCAL_MODULE_CLASS := ETC
+LOCAL_MODULE_PATH := $(TARGET_OUT)/etc/bluetooth
+
+LOCAL_MODULE_TAGS := eng
+
+LOCAL_SRC_FILES := $(LOCAL_MODULE)
+
+include $(BUILD_PREBUILT)
+
diff --git a/conf/google/gce_x86/bt_vendor.conf b/conf/google/gce_x86/bt_vendor.conf
new file mode 100644
index 0000000..2274015
--- /dev/null
+++ b/conf/google/gce_x86/bt_vendor.conf
@@ -0,0 +1,5 @@
+# UART device port where Bluetooth controller is attached
+UartPort=/dev/bluetooth/slave
+
+# Firmware patch file location
+FwPatchFilePath = /vendor/firmware/