summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorChris Elliott <chriselliott@google.com>2015-12-02 13:48:50 -0800
committerChris Elliott <chriselliott@google.com>2015-12-02 13:48:50 -0800
commit8a1508699619f12a0847faa4e98e51601b283a73 (patch)
tree761bf68abf71984a24b163b7a6a74e22d3090e06 /Android.mk
parent3cf0976042e5b0b75c12d81fd600db31801aafb2 (diff)
downloadandroid_hardware_broadcom_libbt-8a1508699619f12a0847faa4e98e51601b283a73.tar.gz
android_hardware_broadcom_libbt-8a1508699619f12a0847faa4e98e51601b283a73.tar.bz2
android_hardware_broadcom_libbt-8a1508699619f12a0847faa4e98e51601b283a73.zip
DO NOT MERGE Final Revert "A2DP Offload BRCM vendor specific implementation"
This reverts commit d51ab12cc1e7b02279b45f91c2f2f9a9b4a1404e.
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk17
1 files changed, 1 insertions, 16 deletions
diff --git a/Android.mk b/Android.mk
index 52c6953..35eab8a 100644
--- a/Android.mk
+++ b/Android.mk
@@ -4,14 +4,6 @@ ifneq ($(BOARD_HAVE_BLUETOOTH_BCM),)
include $(CLEAR_VARS)
-ifneq ($(BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR),)
- bdroid_C_INCLUDES := $(BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR)
- bdroid_CFLAGS += -DHAS_BDROID_BUILDCFG
-else
- bdroid_C_INCLUDES :=
- bdroid_CFLAGS += -DHAS_NO_BDROID_BUILDCFG
-endif
-
BDROID_DIR := $(TOP_DIR)system/bt
ifeq ($(strip $(USE_BLUETOOTH_BCM4343)),true)
@@ -20,7 +12,6 @@ endif
LOCAL_SRC_FILES := \
src/bt_vendor_brcm.c \
- src/bt_vendor_brcm_a2dp.c \
src/hardware.c \
src/userial_vendor.c \
src/upio.c \
@@ -28,13 +19,7 @@ LOCAL_SRC_FILES := \
LOCAL_C_INCLUDES += \
$(LOCAL_PATH)/include \
- $(BDROID_DIR)/hci/include \
- $(BDROID_DIR)/include \
- $(BDROID_DIR)/stack/include \
- $(BDROID_DIR)/gki/ulinux
-
-LOCAL_C_INCLUDES += $(bdroid_C_INCLUDES)
-LOCAL_CFLAGS += $(bdroid_CFLAGS)
+ $(BDROID_DIR)/hci/include
LOCAL_SHARED_LIBRARIES := \
libcutils \