summaryrefslogtreecommitdiff
Diffstat
-rw-r--r--Android.mk6
-rw-r--r--conf/bcm_usb_bt/Android.mk14
-rw-r--r--conf/bcm_usb_bt/bt_vendor.conf5
-rwxr-xr-xsrc/userial_vendor.c13
4 files changed, 34 insertions, 4 deletions
diff --git a/Android.mk b/Android.mk
index 036fa7d..b3b81c6 100644
--- a/Android.mk
+++ b/Android.mk
@@ -31,7 +31,11 @@ include $(LOCAL_PATH)/vnd_buildcfg.mk
include $(BUILD_SHARED_LIBRARY)
-include $(LOCAL_PATH)/conf/meson/Android.mk
+ifeq ($(BCM_USB_BT), true)
+ include $(LOCAL_PATH)/conf/bcm_usb_bt/Android.mk
+else
+ include $(LOCAL_PATH)/conf/meson/Android.mk
+endif
ifeq ($(TARGET_PRODUCT), full_maguro)
include $(LOCAL_PATH)/conf/samsung/maguro/Android.mk