From 84a000f59a48dac41d04da6bf9569258bc0e2cfc Mon Sep 17 00:00:00 2001
From: Kausik Sinnaswamy <kausik@broadcom.com>
Date: Mon, 2 Apr 2012 15:04:26 +0530
Subject: Consolidated patchset for 1) Run-time configuration: configure stack
 and vendor at run-time using bt_stack.conf and bt_vendor.conf in
 /etc/bluetooth/ 2) Build-time configuration: Auto-generate buildcfg.h header
 file from the target config bdroid_$(TARGET_DEVICE).txt file

Change-Id: Ieebb71081b7de404eab37f9ff4596d3dc94547a7
---
 gki/Android.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'gki')

diff --git a/gki/Android.mk b/gki/Android.mk
index 2317fc0..13681ea 100644
--- a/gki/Android.mk
+++ b/gki/Android.mk
@@ -2,6 +2,8 @@ ifneq ($(TARGET_SIMULATOR),true)
 
 LOCAL_PATH:= $(call my-dir)
 
+include $(LOCAL_PATH)/../include/buildcfg.mk
+
 include $(CLEAR_VARS)
 
 LOCAL_C_INCLUDES:= $(LOCAL_PATH)/common \
@@ -25,7 +27,7 @@ LOCAL_SRC_FILES:= \
     ./common/gki_buffer.c 
     
 LOCAL_MODULE := libbt-brcm_gki 
-LOCAL_MODULE_TAGS := eng 
+LOCAL_MODULE_TAGS := optional
 LOCAL_SHARED_LIBRARIES := libcutils libc
 
 include $(BUILD_STATIC_LIBRARY)
-- 
cgit v1.1