Merge "Merge Android Pie into master"
diff --git a/Android.mk b/Android.mk
index 2d74845..6cea8f1 100644
--- a/Android.mk
+++ b/Android.mk
@@ -75,8 +75,5 @@
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
