1 files changed, 16 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk
index 3c3cb61..3f42f6a 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,3 +1,17 @@
-ifneq ($(TARGET_SIMULATOR),true)
-  include $(call all-subdir-makefiles)
+LOCAL_PATH := $(call my-dir)
+
+# Setup bdroid local make variables for handling configuration
+ifneq ($(BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR),)
+  bdroid_C_INCLUDES := $(BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR)
+  bdroid_CFLAGS := -DHAS_BDROID_BUILDCFG
+else
+  $(warning NO BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR, using only generic configuration)
+  bdroid_C_INCLUDES :=
+  bdroid_CFLAGS := -DHAS_NO_BDROID_BUILDCFG
 endif
+
+include $(call all-subdir-makefiles)
+
+# Cleanup our locals
+bdroid_C_INCLUDES :=
+bdroid_CFLaGS :=