summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2017-10-25 08:04:31 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2017-10-25 08:04:31 +0000
commitf0414b0dc19fd44f81331a541ce2145ed0cbd517 (patch)
treeec973de413f46b26cce5f1ce1aa5438035bf9050
parent1d7d21a48104e1328e3432ce8c562377a72b1e5c (diff)
parentf04b046cf490ce9ce16e211787366d46f400279c (diff)
downloadplatform_hardware_broadcom_libbt-f0414b0dc19fd44f81331a541ce2145ed0cbd517.tar.gz
platform_hardware_broadcom_libbt-f0414b0dc19fd44f81331a541ce2145ed0cbd517.tar.bz2
platform_hardware_broadcom_libbt-f0414b0dc19fd44f81331a541ce2145ed0cbd517.zip
Snap for 4415813 from f04b046cf490ce9ce16e211787366d46f400279c to pi-release
Change-Id: Ia6c59e993863580b00899803c1e1222b31926481
-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, 0 insertions, 22 deletions
diff --git a/Android.mk b/Android.mk
index 3572474..caed58b 100644
--- a/Android.mk
+++ b/Android.mk
@@ -65,8 +65,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/