Merge "Use -Werror in hardware/broadcom/libbt" am: 49bd3ecc00 am: 90ddddf06c
am: eeb506c677
Change-Id: I26eec7dc570ab2d455e52e25ebcaf22d0b9076db
diff --git a/Android.mk b/Android.mk
index ea0a67f..582d0ef 100644
--- a/Android.mk
+++ b/Android.mk
@@ -72,8 +72,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/
