diff options
| author | Xin Li <delphij@google.com> | 2018-08-07 16:51:27 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-08-07 16:51:27 +0000 |
| commit | a4319c3d6fc4dd53c80e89c6b9f51136e9ed7cc5 (patch) | |
| tree | 9ba9c1eea340c1b0e0327b056928499dc72f49a6 | |
| parent | 5763f5e96e589694f704ba6baf1db383866314ba (diff) | |
| parent | f27a12d94ebf42bb82e565bf9b51127a97b2b009 (diff) | |
| download | libbt-master-cuttlefish-testing-release.tar.gz | |
Merge "Merge Android Pie into master"android-o-mr1-iot-release-smart-display-r3android-o-mr1-iot-release-1.0.5android-o-mr1-iot-release-1.0.4android-o-mr1-iot-release-1.0.3oreo-mr1-1.2-iot-releasemaster-cuttlefish-testing-release
| -rw-r--r-- | Android.mk | 3 | ||||
| -rw-r--r-- | conf/google/gce_x86/Android.mk | 14 | ||||
| -rw-r--r-- | conf/google/gce_x86/bt_vendor.conf | 5 | ||||
| -rw-r--r-- | include/vnd_kingyo.txt | 15 |
4 files changed, 15 insertions, 22 deletions
@@ -75,8 +75,5 @@ 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 deleted file mode 100644 index 974e213..0000000 --- a/conf/google/gce_x86/Android.mk +++ /dev/null @@ -1,14 +0,0 @@ -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 deleted file mode 100644 index 2274015..0000000 --- a/conf/google/gce_x86/bt_vendor.conf +++ /dev/null @@ -1,5 +0,0 @@ -# UART device port where Bluetooth controller is attached -UartPort=/dev/bluetooth/slave - -# Firmware patch file location -FwPatchFilePath = /vendor/firmware/ diff --git a/include/vnd_kingyo.txt b/include/vnd_kingyo.txt new file mode 100644 index 0000000..aa4f6e3 --- /dev/null +++ b/include/vnd_kingyo.txt @@ -0,0 +1,15 @@ +BLUETOOTH_UART_DEVICE_PORT = "/dev/ttySAC4" +BTHW_DBG = TRUE +BTVND_DBG = TRUE +FW_PATCHFILE_LOCATION = "/system/vendor/firmware/" +FW_PATCH_SETTLEMENT_DELAY_MS = 200 +LPM_IDLE_TIMEOUT_MULTIPLE = 1 +#SCO_I2SPCM_IF_CLOCK_RATE = 1 +#SCO_I2SPCM_IF_ROLE = 1 +#SCO_PCM_IF_CLOCK_MODE = 1 +#SCO_PCM_IF_CLOCK_RATE = 1 +#SCO_PCM_IF_SYNC_MODE = 1 +SCO_USE_I2S_INTERFACE = FALSE +UART_TARGET_BAUD_RATE = 3000000 +UPIO_DBG = TRUE +VNDUSERIAL_DBG = TRUE |