26 files changed, 516 insertions, 2351 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 :=
diff --git a/bta/Android.mk b/bta/Android.mk
index 22665a3..7d1c19e 100644
--- a/bta/Android.mk
+++ b/bta/Android.mk
@@ -8,7 +8,7 @@ ifeq ($(BOARD_HAVE_BLUETOOTH_BCM),true)
 LOCAL_CFLAGS += \
 	-DBOARD_HAVE_BLUETOOTH_BCM
 endif
-LOCAL_CFLAGS += -DBUILDCFG
+LOCAL_CFLAGS += -DBUILDCFG $(bdroid_CFLAGS)
 
 LOCAL_PRELINK_MODULE:=false
 LOCAL_SRC_FILES:= \
@@ -96,8 +96,8 @@ LOCAL_C_INCLUDES+= . \
                    $(LOCAL_PATH)/../hcis/patchram \
                    $(LOCAL_PATH)/../udrv/include \
                    $(LOCAL_PATH)/../brcm/include \
+                   $(bdroid_C_INCLUDES) \
 
-include $(LOCAL_PATH)/../include/buildcfg.mk
 
 include $(BUILD_STATIC_LIBRARY)
 
diff --git a/bta/dm/bta_dm_cfg.c b/bta/dm/bta_dm_cfg.c
index d3ae0ec..f0f7ac9 100644
--- a/bta/dm/bta_dm_cfg.c
+++ b/bta/dm/bta_dm_cfg.c
@@ -324,7 +324,7 @@ tBTA_DM_PM_TYPE_QUALIFIER tBTM_PM_PWR_MD bta_dm_pm_md[] =
 {
 /* more sniff parameter entries can be added for BTA_DM_PM_SNIFF3 - BTA_DM_PM_SNIFF7, if needed
 When entries are added or removed, BTA_DM_PM_PARK_IDX needs to be updated to reflect the actual index
-BTA_DM_PM_PARK_IDX is defined in bta_api.h and can be override by the buildcfg.h settings.
+BTA_DM_PM_PARK_IDX is defined in bta_api.h and can be override by the bdroid_buildcfg.h settings.
 The SNIFF table entries must be in the order from highest latency (biggest interval) to lowest latency.
 If there's a conflict among the connected services, the setting with lowest latency wins.
 */
diff --git a/gki/Android.mk b/gki/Android.mk
index c8d8923..13a4a95 100644
--- a/gki/Android.mk
+++ b/gki/Android.mk
@@ -7,10 +7,10 @@ include $(CLEAR_VARS)
 LOCAL_C_INCLUDES:= $(LOCAL_PATH)/common \
                    $(LOCAL_PATH)/ulinux \
                    $(LOCAL_PATH)/../include \
-                   $(LOCAL_PATH)/../stack/include/
+                   $(LOCAL_PATH)/../stack/include \
+                   $(bdroid_C_INCLUDES) \
 
-
-LOCAL_CFLAGS += -Werror
+LOCAL_CFLAGS += -Werror $(bdroid_CFLAGS)
 
 ifeq ($(BOARD_HAVE_BLUETOOTH_BCM),true)
 LOCAL_CFLAGS += \
@@ -29,8 +29,6 @@ LOCAL_MODULE_TAGS := optional
 LOCAL_SHARED_LIBRARIES := libcutils libc
 LOCAL_MODULE_CLASS := STATIC_LIBRARIES
 
-include $(LOCAL_PATH)/../include/buildcfg.mk
-
 include $(BUILD_STATIC_LIBRARY)
 
 endif  # TARGET_SIMULATOR != true
diff --git a/gki/common/gki.h b/gki/common/gki.h
index a1005dc..d53ab04 100644
--- a/gki/common/gki.h
+++ b/gki/common/gki.h
@@ -12,9 +12,6 @@
 #ifndef GKI_H
 #define GKI_H
 
-#ifdef BUILDCFG
-#include "buildcfg.h"
-#endif
 
 /* Include platform-specific over-rides */
 #if (defined(NFC_STANDALONE) && (NFC_STANDALONE == TRUE))
diff --git a/hci/include/bt_hci_bdroid.h b/hci/include/bt_hci_bdroid.h
index 76d438c..5f07539 100644
--- a/hci/include/bt_hci_bdroid.h
+++ b/hci/include/bt_hci_bdroid.h
@@ -60,7 +60,6 @@
 #define BT_HCI_BDROID_H
 
 #include "bt_hci_lib.h"
-//#include "hci_buildcfg.h"
 
 /******************************************************************************
 **  Constants & Macros
diff --git a/include/bdroid_crespo.txt b/include/bdroid_crespo.txt
deleted file mode 100755
index 7301701..0000000
--- a/include/bdroid_crespo.txt
+++ /dev/null
@@ -1,172 +0,0 @@
-AVCT_INCLUDED =  TRUE
-AVRC_INCLUDED = TRUE
-AVDT_INCLUDED = TRUE
-UNV_INCLUDED = FALSE
-A2D_INCLUDED = TRUE
-A2D_SBC_INCLUDED = TRUE
-DUN_INCLUDED = FALSE
-GAP_INCLUDED = FALSE
-GOEP_INCLUDED = FALSE
-GOEP_FS_INCLUDED = FALSE
-GATT_PTS = FALSE
-BTM_SEC_MAX_SERVICE_RECORDS = 32
-L2CAP_INCLUDED = TRUE
-L2CAP_LINK_INACTIVITY_TOUT = 4
-L2CAP_FCR_INCLUDED = TRUE
-L2CAP_EXTFEA_SUPPORTED_MASK = (L2CAP_EXTFEA_ENH_RETRANS | L2CAP_EXTFEA_STREAM_MODE | L2CAP_EXTFEA_NO_CRC | L2CAP_EXTFEA_FIXED_CHNLS)
-BTUI_OPS_FORMATS = (BTA_OP_VCARD21_MASK | BTA_OP_VCAL_MASK | BTA_OP_VNOTE_MASK | BTA_OP_ANY_MASK)
-RFCOMM_INCLUDED = TRUE
-MAX_RFC_PORTS = 30
-MAX_ACL_CONNECTIONS = 7
-MAX_L2CAP_CHANNELS = 16
-BTA_RFC_MTU_SIZE = (L2CAP_MTU_SIZE-L2CAP_MIN_OFFSET-RFCOMM_DATA_OVERHEAD)
-PORT_TX_BUF_HIGH_WM = 10
-PORT_RX_BUF_HIGH_WM = 10
-PORT_RX_BUF_LOW_WM = 4
-PORT_RX_BUF_CRITICAL_WM = 15
-PORT_TX_BUF_CRITICAL_WM = 15
-PORT_RX_LOW_WM = (BTA_RFC_MTU_SIZE * PORT_RX_BUF_LOW_WM)
-PORT_RX_HIGH_WM = (BTA_RFC_MTU_SIZE * PORT_RX_BUF_HIGH_WM)
-PORT_RX_CRITICAL_WM = (BTA_RFC_MTU_SIZE * PORT_RX_BUF_CRITICAL_WM)
-PORT_TX_HIGH_WM = (BTA_RFC_MTU_SIZE * PORT_TX_BUF_HIGH_WM)
-PORT_TX_CRITICAL_WM = (BTA_RFC_MTU_SIZE * PORT_TX_BUF_CRITICAL_WM)
-BTA_DUN_MTU = BTA_RFC_MTU_SIZE
-BTA_SPP_MTU = BTA_RFC_MTU_SIZE
-BTA_FAX_MTU = BTA_RFC_MTU_SIZE
-SDP_DI_INCLUDED = TRUE
-SDP_RAW_DATA_INCLUDED = TRUE
-SDP_RAW_PDU_INCLUDED = TRUE
-SDP_POOL_ID = 3
-SDP_MAX_REC_ATTR = 25
-SDP_MAX_ATTR_LEN = 400
-SDP_MAX_PAD_LEN = 600
-BNEP_INCLUDED = TRUE
-PAN_INCLUDED = TRUE
-HID_DEV_INCLUDED = FALSE
-HID_HOST_INCLUDED = TRUE
-BLE_INCLUDED = FALSE
-BTM_BLE_CONFORMANCE_TESTING = FALSE
-ATT_INCLUDED = FALSE
-ATT_DEBUG = FALSE
-GATTS_APPU_USE_GATT_TRACE = FALSE
-GATT_CLIENT_ENABLED = FALSE
-GATT_SERVER_ENABLED = FALSE
-SMP_INCLUDED = FALSE
-SMP_HOST_ENCRYPT_INCLUDED = FALSE
-SER_INCLUDED = FALSE
-RPC_INCLUDED = FALSE
-MMI_INCLUDED = FALSE
-SAP_INCLUDED = FALSE
-SBC_NO_PCM_CPY_OPTION = FALSE
-SBC_IPAQ_OPT = FALSE
-SBC_IS_64_MULT_IN_QUANTIZER = FALSE
-BTA_INCLUDED = TRUE
-BTA_AG_INCLUDED = TRUE
-BTA_CT_INCLUDED = FALSE
-BTA_CG_INCLUDED = FALSE
-BTA_DG_INCLUDED = FALSE
-BTA_FT_INCLUDED = FALSE
-BTA_OP_INCLUDED = FALSE
-BTA_PR_INCLUDED = FALSE
-BTA_SS_INCLUDED = FALSE
-BTA_DM_INCLUDED = TRUE
-BTA_DI_INCLUDED = FALSE
-BTA_BI_INCLUDED = FALSE
-BTA_SC_INCLUDED = FALSE
-BTA_PAN_INCLUDED = TRUE
-BTA_FS_INCLUDED = TRUE
-BTA_AC_INCLUDED = FALSE
-BTA_HD_INCLUDED = FALSE
-BTA_HH_INCLUDED = TRUE
-BTA_HH_ROLE = BTA_MASTER_ROLE_PREF
-BTA_AR_INCLUDED = TRUE
-BTA_AV_INCLUDED = TRUE
-BTA_AV_VDP_INCLUDED = FALSE
-BTA_AVK_INCLUDED = FALSE
-BTA_PBS_INCLUDED = FALSE
-BTA_PBC_INCLUDED = FALSE
-BTA_FM_INCLUDED = FALSE
-BTA_FM_DEBUG = FALSE
-BTA_FMTX_INCLUDED = FALSE
-BTA_FMTX_DEBUG = FALSE
-BTA_FMTX_FMRX_SWITCH_WORKAROUND = FALSE
-BTA_FMTX_US_FCC_RULES = FALSE
-BTA_HS_INCLUDED = FALSE
-BTA_MSE_INCLUDED = FALSE
-BTA_MCE_INCLUDED = FALSE
-BTA_PLAYBACK_INCLUDED = FALSE
-BTA_SSR_INCLUDED = FALSE
-BTA_JV_INCLUDED = FALSE
-BTA_EIR_CANNED_UUID_LIST = FALSE
-BTA_GATT_INCLUDED = FALSE
-RSI_INCLUDED = TRUE
-RPC_TRACE_ONLY = FALSE
-ANDROID_APP_INCLUDED = TRUE
-ANDROID_USE_LOGCAT = TRUE
-LINUX_GKI_INCLUDED = TRUE
-TICKS_PER_SEC = 100
-QUICK_TIMER_TICKS_PER_SEC = 10
-BTA_SYS_TIMER_PERIOD = 100
-GKI_BUF1_SIZE = 288
-GKI_BUF3_MAX = 200
-GKI_BUF3_SIZE = (4096+16)
-GKI_BUF4_SIZE = (8080+26)
-GKI_SHUTDOWN_EVT = APPL_EVT_7
-GKI_PTHREAD_JOINABLE = TRUE
-LINUX_DRV_INCLUDED = TRUE
-LINUX_OS = TRUE
-BTU_TASK = 0
-BTIF_TASK = 1
-A2DP_MEDIA_TASK = 2
-GKI_MAX_TASKS = 3
-BTM_APP_DEV_INIT = bte_main_post_reset_init
-BTE_IDLE_TASK_INCLUDED = FALSE
-APPL_INCLUDED = TRUE
-BTU_BTA_INCLUDED = TRUE
-SBC_FOR_EMBEDDED_LINUX = TRUE
-BTA_DM_REMOTE_DEVICE_NAME_LENGTH = 248
-BTM_MAX_REM_BD_NAME_LEN = 248
-BTM_MAX_LOC_BD_NAME_LEN = 248
-BTM_USE_DEF_LOCAL_NAME = TRUE
-BTM_DEF_LOCAL_NAME = "Nexus S 2"
-BTM_INQ_DB_SIZE = 40
-BTM_SEC_MAX_DEVICE_RECORDS = 100
-BTM_SEC_FORCE_RNR_FOR_DBOND = FALSE
-BTM_AUTOMATIC_HCI_RESET = FALSE
-AVDT_VERSION = 0x0102
-BTA_AG_AT_MAX_LEN = 512
-BTA_AVRCP_FF_RW_SUPPORT = TRUE
-BTM_MAX_SCO_LINKS = 2
-BTA_AG_SCO_PKT_TYPES = (BTM_SCO_LINK_ONLY_MASK | BTM_SCO_PKT_TYPES_MASK_EV3 |  BTM_SCO_PKT_TYPES_MASK_NO_3_EV3 | BTM_SCO_PKT_TYPES_MASK_NO_2_EV5 | BTM_SCO_PKT_TYPES_MASK_NO_3_EV5)
-BTAPP_AV_SECMASK = (BTA_SEC_AUTHENTICATE | BTA_SEC_AUTHORIZE)
-BTA_AV_MAX_A2DP_MTU = 668
-PORCHE_PAIRING_CONFLICT = TRUE
-BTA_AV_CO_CP_SCMS_T = FALSE
-AVDT_CONNECT_CP_ONLY = FALSE
-BTL_CFG_USE_CONF_FILE = FALSE
-BTAPP_AHF_API_SUPPORT = TRUE
-HCILP_INCLUDED = TRUE
-HCISU_H4_INCLUDED = TRUE
-BT_TRACE_PROTOCOL = TRUE
-BT_USE_TRACES = TRUE
-BT_TRACE_BTIF = TRUE
-BTTRC_INCLUDED = FALSE
-BT_TRACE_VERBOSE = FALSE
-BTTRC_PARSER_INCLUDED = FALSE
-MAX_TRACE_RAM_SIZE = 10000
-OBX_INITIAL_TRACE_LEVEL = BT_TRACE_LEVEL_ERROR
-BTM_ALLOW_CONN_IF_NONDISCOVER = TRUE
-BTAPP_FM_USE_HW_POKE_VOLUME = FALSE
-BTAPP_FM_AUDIO_PATH = BTA_FM_AUDIO_DAC
-BTAPP_DM_SUPPORTED_SERVICES = (BTA_HSP_SERVICE_MASK | BTA_HFP_SERVICE_MASK | BTA_A2DP_SERVICE_MASK | BTA_HID_SERVICE_MASK | BTA_OPP_SERVICE_MASK | BTA_BPP_SERVICE_MASK | BTA_NAP_SERVICE_MASK | BTA_PANU_SERVICE_MASK | BTA_HL_SERVICE_MASK)
-PBAP_ZERO_VCARD_IN_DB = FALSE
-BTA_DM_SDP_DB_SIZE = 8000
-MAX_L2CAP_CLIENTS = 15
-FTS_REJECT_INVALID_OBEX_SET_PATH_REQ = FALSE
-HID_HOST_MAX_CONN_RETRY = (3)
-BTM_DISC_DURING_RS = TRUE
-BTM_WBS_INCLUDED = FALSE
-HL_INCLUDED = TRUE
-NO_GKI_RUN_RETURN = TRUE
-AG_VOICE_SETTINGS = HCI_DEFAULT_VOICE_SETTINGS
-BTIF_DM_OOB_TEST = TRUE
diff --git a/include/bdroid_crespo4g.txt b/include/bdroid_crespo4g.txt
deleted file mode 100755
index 7301701..0000000
--- a/include/bdroid_crespo4g.txt
+++ /dev/null
@@ -1,172 +0,0 @@
-AVCT_INCLUDED =  TRUE
-AVRC_INCLUDED = TRUE
-AVDT_INCLUDED = TRUE
-UNV_INCLUDED = FALSE
-A2D_INCLUDED = TRUE
-A2D_SBC_INCLUDED = TRUE
-DUN_INCLUDED = FALSE
-GAP_INCLUDED = FALSE
-GOEP_INCLUDED = FALSE
-GOEP_FS_INCLUDED = FALSE
-GATT_PTS = FALSE
-BTM_SEC_MAX_SERVICE_RECORDS = 32
-L2CAP_INCLUDED = TRUE
-L2CAP_LINK_INACTIVITY_TOUT = 4
-L2CAP_FCR_INCLUDED = TRUE
-L2CAP_EXTFEA_SUPPORTED_MASK = (L2CAP_EXTFEA_ENH_RETRANS | L2CAP_EXTFEA_STREAM_MODE | L2CAP_EXTFEA_NO_CRC | L2CAP_EXTFEA_FIXED_CHNLS)
-BTUI_OPS_FORMATS = (BTA_OP_VCARD21_MASK | BTA_OP_VCAL_MASK | BTA_OP_VNOTE_MASK | BTA_OP_ANY_MASK)
-RFCOMM_INCLUDED = TRUE
-MAX_RFC_PORTS = 30
-MAX_ACL_CONNECTIONS = 7
-MAX_L2CAP_CHANNELS = 16
-BTA_RFC_MTU_SIZE = (L2CAP_MTU_SIZE-L2CAP_MIN_OFFSET-RFCOMM_DATA_OVERHEAD)
-PORT_TX_BUF_HIGH_WM = 10
-PORT_RX_BUF_HIGH_WM = 10
-PORT_RX_BUF_LOW_WM = 4
-PORT_RX_BUF_CRITICAL_WM = 15
-PORT_TX_BUF_CRITICAL_WM = 15
-PORT_RX_LOW_WM = (BTA_RFC_MTU_SIZE * PORT_RX_BUF_LOW_WM)
-PORT_RX_HIGH_WM = (BTA_RFC_MTU_SIZE * PORT_RX_BUF_HIGH_WM)
-PORT_RX_CRITICAL_WM = (BTA_RFC_MTU_SIZE * PORT_RX_BUF_CRITICAL_WM)
-PORT_TX_HIGH_WM = (BTA_RFC_MTU_SIZE * PORT_TX_BUF_HIGH_WM)
-PORT_TX_CRITICAL_WM = (BTA_RFC_MTU_SIZE * PORT_TX_BUF_CRITICAL_WM)
-BTA_DUN_MTU = BTA_RFC_MTU_SIZE
-BTA_SPP_MTU = BTA_RFC_MTU_SIZE
-BTA_FAX_MTU = BTA_RFC_MTU_SIZE
-SDP_DI_INCLUDED = TRUE
-SDP_RAW_DATA_INCLUDED = TRUE
-SDP_RAW_PDU_INCLUDED = TRUE
-SDP_POOL_ID = 3
-SDP_MAX_REC_ATTR = 25
-SDP_MAX_ATTR_LEN = 400
-SDP_MAX_PAD_LEN = 600
-BNEP_INCLUDED = TRUE
-PAN_INCLUDED = TRUE
-HID_DEV_INCLUDED = FALSE
-HID_HOST_INCLUDED = TRUE
-BLE_INCLUDED = FALSE
-BTM_BLE_CONFORMANCE_TESTING = FALSE
-ATT_INCLUDED = FALSE
-ATT_DEBUG = FALSE
-GATTS_APPU_USE_GATT_TRACE = FALSE
-GATT_CLIENT_ENABLED = FALSE
-GATT_SERVER_ENABLED = FALSE
-SMP_INCLUDED = FALSE
-SMP_HOST_ENCRYPT_INCLUDED = FALSE
-SER_INCLUDED = FALSE
-RPC_INCLUDED = FALSE
-MMI_INCLUDED = FALSE
-SAP_INCLUDED = FALSE
-SBC_NO_PCM_CPY_OPTION = FALSE
-SBC_IPAQ_OPT = FALSE
-SBC_IS_64_MULT_IN_QUANTIZER = FALSE
-BTA_INCLUDED = TRUE
-BTA_AG_INCLUDED = TRUE
-BTA_CT_INCLUDED = FALSE
-BTA_CG_INCLUDED = FALSE
-BTA_DG_INCLUDED = FALSE
-BTA_FT_INCLUDED = FALSE
-BTA_OP_INCLUDED = FALSE
-BTA_PR_INCLUDED = FALSE
-BTA_SS_INCLUDED = FALSE
-BTA_DM_INCLUDED = TRUE
-BTA_DI_INCLUDED = FALSE
-BTA_BI_INCLUDED = FALSE
-BTA_SC_INCLUDED = FALSE
-BTA_PAN_INCLUDED = TRUE
-BTA_FS_INCLUDED = TRUE
-BTA_AC_INCLUDED = FALSE
-BTA_HD_INCLUDED = FALSE
-BTA_HH_INCLUDED = TRUE
-BTA_HH_ROLE = BTA_MASTER_ROLE_PREF
-BTA_AR_INCLUDED = TRUE
-BTA_AV_INCLUDED = TRUE
-BTA_AV_VDP_INCLUDED = FALSE
-BTA_AVK_INCLUDED = FALSE
-BTA_PBS_INCLUDED = FALSE
-BTA_PBC_INCLUDED = FALSE
-BTA_FM_INCLUDED = FALSE
-BTA_FM_DEBUG = FALSE
-BTA_FMTX_INCLUDED = FALSE
-BTA_FMTX_DEBUG = FALSE
-BTA_FMTX_FMRX_SWITCH_WORKAROUND = FALSE
-BTA_FMTX_US_FCC_RULES = FALSE
-BTA_HS_INCLUDED = FALSE
-BTA_MSE_INCLUDED = FALSE
-BTA_MCE_INCLUDED = FALSE
-BTA_PLAYBACK_INCLUDED = FALSE
-BTA_SSR_INCLUDED = FALSE
-BTA_JV_INCLUDED = FALSE
-BTA_EIR_CANNED_UUID_LIST = FALSE
-BTA_GATT_INCLUDED = FALSE
-RSI_INCLUDED = TRUE
-RPC_TRACE_ONLY = FALSE
-ANDROID_APP_INCLUDED = TRUE
-ANDROID_USE_LOGCAT = TRUE
-LINUX_GKI_INCLUDED = TRUE
-TICKS_PER_SEC = 100
-QUICK_TIMER_TICKS_PER_SEC = 10
-BTA_SYS_TIMER_PERIOD = 100
-GKI_BUF1_SIZE = 288
-GKI_BUF3_MAX = 200
-GKI_BUF3_SIZE = (4096+16)
-GKI_BUF4_SIZE = (8080+26)
-GKI_SHUTDOWN_EVT = APPL_EVT_7
-GKI_PTHREAD_JOINABLE = TRUE
-LINUX_DRV_INCLUDED = TRUE
-LINUX_OS = TRUE
-BTU_TASK = 0
-BTIF_TASK = 1
-A2DP_MEDIA_TASK = 2
-GKI_MAX_TASKS = 3
-BTM_APP_DEV_INIT = bte_main_post_reset_init
-BTE_IDLE_TASK_INCLUDED = FALSE
-APPL_INCLUDED = TRUE
-BTU_BTA_INCLUDED = TRUE
-SBC_FOR_EMBEDDED_LINUX = TRUE
-BTA_DM_REMOTE_DEVICE_NAME_LENGTH = 248
-BTM_MAX_REM_BD_NAME_LEN = 248
-BTM_MAX_LOC_BD_NAME_LEN = 248
-BTM_USE_DEF_LOCAL_NAME = TRUE
-BTM_DEF_LOCAL_NAME = "Nexus S 2"
-BTM_INQ_DB_SIZE = 40
-BTM_SEC_MAX_DEVICE_RECORDS = 100
-BTM_SEC_FORCE_RNR_FOR_DBOND = FALSE
-BTM_AUTOMATIC_HCI_RESET = FALSE
-AVDT_VERSION = 0x0102
-BTA_AG_AT_MAX_LEN = 512
-BTA_AVRCP_FF_RW_SUPPORT = TRUE
-BTM_MAX_SCO_LINKS = 2
-BTA_AG_SCO_PKT_TYPES = (BTM_SCO_LINK_ONLY_MASK | BTM_SCO_PKT_TYPES_MASK_EV3 |  BTM_SCO_PKT_TYPES_MASK_NO_3_EV3 | BTM_SCO_PKT_TYPES_MASK_NO_2_EV5 | BTM_SCO_PKT_TYPES_MASK_NO_3_EV5)
-BTAPP_AV_SECMASK = (BTA_SEC_AUTHENTICATE | BTA_SEC_AUTHORIZE)
-BTA_AV_MAX_A2DP_MTU = 668
-PORCHE_PAIRING_CONFLICT = TRUE
-BTA_AV_CO_CP_SCMS_T = FALSE
-AVDT_CONNECT_CP_ONLY = FALSE
-BTL_CFG_USE_CONF_FILE = FALSE
-BTAPP_AHF_API_SUPPORT = TRUE
-HCILP_INCLUDED = TRUE
-HCISU_H4_INCLUDED = TRUE
-BT_TRACE_PROTOCOL = TRUE
-BT_USE_TRACES = TRUE
-BT_TRACE_BTIF = TRUE
-BTTRC_INCLUDED = FALSE
-BT_TRACE_VERBOSE = FALSE
-BTTRC_PARSER_INCLUDED = FALSE
-MAX_TRACE_RAM_SIZE = 10000
-OBX_INITIAL_TRACE_LEVEL = BT_TRACE_LEVEL_ERROR
-BTM_ALLOW_CONN_IF_NONDISCOVER = TRUE
-BTAPP_FM_USE_HW_POKE_VOLUME = FALSE
-BTAPP_FM_AUDIO_PATH = BTA_FM_AUDIO_DAC
-BTAPP_DM_SUPPORTED_SERVICES = (BTA_HSP_SERVICE_MASK | BTA_HFP_SERVICE_MASK | BTA_A2DP_SERVICE_MASK | BTA_HID_SERVICE_MASK | BTA_OPP_SERVICE_MASK | BTA_BPP_SERVICE_MASK | BTA_NAP_SERVICE_MASK | BTA_PANU_SERVICE_MASK | BTA_HL_SERVICE_MASK)
-PBAP_ZERO_VCARD_IN_DB = FALSE
-BTA_DM_SDP_DB_SIZE = 8000
-MAX_L2CAP_CLIENTS = 15
-FTS_REJECT_INVALID_OBEX_SET_PATH_REQ = FALSE
-HID_HOST_MAX_CONN_RETRY = (3)
-BTM_DISC_DURING_RS = TRUE
-BTM_WBS_INCLUDED = FALSE
-HL_INCLUDED = TRUE
-NO_GKI_RUN_RETURN = TRUE
-AG_VOICE_SETTINGS = HCI_DEFAULT_VOICE_SETTINGS
-BTIF_DM_OOB_TEST = TRUE
diff --git a/include/bdroid_generic.txt b/include/bdroid_generic.txt
deleted file mode 100755
index 204b09f..0000000
--- a/include/bdroid_generic.txt
+++ /dev/null
@@ -1,171 +0,0 @@
-AVCT_INCLUDED =  TRUE
-AVRC_INCLUDED = TRUE
-AVDT_INCLUDED = TRUE
-UNV_INCLUDED = FALSE
-A2D_INCLUDED = TRUE
-A2D_SBC_INCLUDED = TRUE
-DUN_INCLUDED = FALSE
-GAP_INCLUDED = FALSE
-GOEP_INCLUDED = FALSE
-GOEP_FS_INCLUDED = FALSE
-GATT_PTS = FALSE
-BTM_SEC_MAX_SERVICE_RECORDS = 32
-L2CAP_INCLUDED = TRUE
-L2CAP_LINK_INACTIVITY_TOUT = 4
-L2CAP_FCR_INCLUDED = TRUE
-L2CAP_EXTFEA_SUPPORTED_MASK = (L2CAP_EXTFEA_ENH_RETRANS | L2CAP_EXTFEA_STREAM_MODE | L2CAP_EXTFEA_NO_CRC | L2CAP_EXTFEA_FIXED_CHNLS)
-BTUI_OPS_FORMATS = (BTA_OP_VCARD21_MASK | BTA_OP_VCAL_MASK | BTA_OP_VNOTE_MASK | BTA_OP_ANY_MASK)
-RFCOMM_INCLUDED = TRUE
-MAX_RFC_PORTS = 30
-MAX_ACL_CONNECTIONS = 7
-MAX_L2CAP_CHANNELS = 16
-BTA_RFC_MTU_SIZE = (L2CAP_MTU_SIZE-L2CAP_MIN_OFFSET-RFCOMM_DATA_OVERHEAD)
-PORT_TX_BUF_HIGH_WM = 10
-PORT_RX_BUF_HIGH_WM = 10
-PORT_RX_BUF_LOW_WM = 4
-PORT_RX_BUF_CRITICAL_WM = 15
-PORT_TX_BUF_CRITICAL_WM = 15
-PORT_RX_LOW_WM = (BTA_RFC_MTU_SIZE * PORT_RX_BUF_LOW_WM)
-PORT_RX_HIGH_WM = (BTA_RFC_MTU_SIZE * PORT_RX_BUF_HIGH_WM)
-PORT_RX_CRITICAL_WM = (BTA_RFC_MTU_SIZE * PORT_RX_BUF_CRITICAL_WM)
-PORT_TX_HIGH_WM = (BTA_RFC_MTU_SIZE * PORT_TX_BUF_HIGH_WM)
-PORT_TX_CRITICAL_WM = (BTA_RFC_MTU_SIZE * PORT_TX_BUF_CRITICAL_WM)
-BTA_DUN_MTU = BTA_RFC_MTU_SIZE
-BTA_SPP_MTU = BTA_RFC_MTU_SIZE
-BTA_FAX_MTU = BTA_RFC_MTU_SIZE
-SDP_DI_INCLUDED = TRUE
-SDP_RAW_DATA_INCLUDED = TRUE
-SDP_RAW_PDU_INCLUDED = TRUE
-SDP_POOL_ID = 3
-SDP_MAX_REC_ATTR = 25
-SDP_MAX_ATTR_LEN = 400
-SDP_MAX_PAD_LEN = 600
-BNEP_INCLUDED = TRUE
-PAN_INCLUDED = TRUE
-HID_DEV_INCLUDED = FALSE
-HID_HOST_INCLUDED = TRUE
-BLE_INCLUDED = FALSE
-BTM_BLE_CONFORMANCE_TESTING = FALSE
-ATT_INCLUDED = FALSE
-ATT_DEBUG = FALSE
-GATTS_APPU_USE_GATT_TRACE = FALSE
-GATT_CLIENT_ENABLED = FALSE
-GATT_SERVER_ENABLED = FALSE
-SMP_INCLUDED = FALSE
-SMP_HOST_ENCRYPT_INCLUDED = FALSE
-SER_INCLUDED = FALSE
-RPC_INCLUDED = FALSE
-MMI_INCLUDED = FALSE
-SAP_INCLUDED = FALSE
-SBC_NO_PCM_CPY_OPTION = FALSE
-SBC_IPAQ_OPT = FALSE
-SBC_IS_64_MULT_IN_QUANTIZER = FALSE
-BTA_INCLUDED = TRUE
-BTA_AG_INCLUDED = TRUE
-BTA_CT_INCLUDED = FALSE
-BTA_CG_INCLUDED = FALSE
-BTA_DG_INCLUDED = FALSE
-BTA_FT_INCLUDED = FALSE
-BTA_OP_INCLUDED = FALSE
-BTA_PR_INCLUDED = FALSE
-BTA_SS_INCLUDED = FALSE
-BTA_DM_INCLUDED = TRUE
-BTA_DI_INCLUDED = FALSE
-BTA_BI_INCLUDED = FALSE
-BTA_SC_INCLUDED = FALSE
-BTA_PAN_INCLUDED = TRUE
-BTA_FS_INCLUDED = TRUE
-BTA_AC_INCLUDED = FALSE
-BTA_HD_INCLUDED = FALSE
-BTA_HH_INCLUDED = TRUE
-BTA_HH_ROLE = BTA_MASTER_ROLE_PREF
-BTA_AR_INCLUDED = TRUE
-BTA_AV_INCLUDED = TRUE
-BTA_AV_VDP_INCLUDED = FALSE
-BTA_AVK_INCLUDED = FALSE
-BTA_PBS_INCLUDED = FALSE
-BTA_PBC_INCLUDED = FALSE
-BTA_FM_INCLUDED = FALSE
-BTA_FM_DEBUG = FALSE
-BTA_FMTX_INCLUDED = FALSE
-BTA_FMTX_DEBUG = FALSE
-BTA_FMTX_FMRX_SWITCH_WORKAROUND = FALSE
-BTA_FMTX_US_FCC_RULES = FALSE
-BTA_HS_INCLUDED = FALSE
-BTA_MSE_INCLUDED = FALSE
-BTA_MCE_INCLUDED = FALSE
-BTA_PLAYBACK_INCLUDED = FALSE
-BTA_SSR_INCLUDED = FALSE
-BTA_JV_INCLUDED = FALSE
-BTA_EIR_CANNED_UUID_LIST = FALSE
-BTA_GATT_INCLUDED = FALSE
-RSI_INCLUDED = TRUE
-RPC_TRACE_ONLY = FALSE
-ANDROID_APP_INCLUDED = TRUE
-ANDROID_USE_LOGCAT = TRUE
-LINUX_GKI_INCLUDED = TRUE
-TICKS_PER_SEC = 100
-QUICK_TIMER_TICKS_PER_SEC = 10
-BTA_SYS_TIMER_PERIOD = 100
-GKI_BUF1_SIZE = 288
-GKI_BUF3_MAX = 200
-GKI_BUF3_SIZE = (4096+16)
-GKI_BUF4_SIZE = (8080+26)
-GKI_SHUTDOWN_EVT = APPL_EVT_7
-GKI_PTHREAD_JOINABLE = TRUE
-LINUX_DRV_INCLUDED = TRUE
-LINUX_OS = TRUE
-BTU_TASK = 0
-BTIF_TASK = 1
-A2DP_MEDIA_TASK = 2
-GKI_MAX_TASKS = 3
-BTM_APP_DEV_INIT = bte_main_post_reset_init
-BTE_IDLE_TASK_INCLUDED = FALSE
-APPL_INCLUDED = TRUE
-BTU_BTA_INCLUDED = TRUE
-SBC_FOR_EMBEDDED_LINUX = TRUE
-BTA_DM_REMOTE_DEVICE_NAME_LENGTH = 248
-BTM_MAX_REM_BD_NAME_LEN = 248
-BTM_MAX_LOC_BD_NAME_LEN = 248
-BTM_USE_DEF_LOCAL_NAME = TRUE
-BTM_DEF_LOCAL_NAME = "Galaxy Nexus 2"
-BTM_INQ_DB_SIZE = 40
-BTM_SEC_MAX_DEVICE_RECORDS = 100
-BTM_SEC_FORCE_RNR_FOR_DBOND = FALSE
-BTM_AUTOMATIC_HCI_RESET = FALSE
-AVDT_VERSION = 0x0102
-BTA_AG_AT_MAX_LEN = 512
-BTA_AVRCP_FF_RW_SUPPORT = TRUE
-BTM_MAX_SCO_LINKS = 2
-BTA_AG_SCO_PKT_TYPES = (BTM_SCO_LINK_ONLY_MASK | BTM_SCO_PKT_TYPES_MASK_EV3 |  BTM_SCO_PKT_TYPES_MASK_NO_3_EV3 | BTM_SCO_PKT_TYPES_MASK_NO_2_EV5 | BTM_SCO_PKT_TYPES_MASK_NO_3_EV5)
-BTAPP_AV_SECMASK = (BTA_SEC_AUTHENTICATE | BTA_SEC_AUTHORIZE)
-BTA_AV_MAX_A2DP_MTU = 668
-BTA_AV_RET_TOUT = 15
-PORCHE_PAIRING_CONFLICT = TRUE
-BTA_AV_CO_CP_SCMS_T = FALSE
-AVDT_CONNECT_CP_ONLY = FALSE
-BTL_CFG_USE_CONF_FILE = FALSE
-BTAPP_AHF_API_SUPPORT = TRUE
-HCILP_INCLUDED = TRUE
-HCISU_H4_INCLUDED = TRUE
-BT_TRACE_PROTOCOL = TRUE
-BT_USE_TRACES = TRUE
-BT_TRACE_BTIF = TRUE
-BTTRC_INCLUDED = FALSE
-BT_TRACE_VERBOSE = FALSE
-BTTRC_PARSER_INCLUDED = FALSE
-MAX_TRACE_RAM_SIZE = 10000
-OBX_INITIAL_TRACE_LEVEL = BT_TRACE_LEVEL_ERROR
-BTM_ALLOW_CONN_IF_NONDISCOVER = TRUE
-BTAPP_DM_SUPPORTED_SERVICES = (BTA_HSP_SERVICE_MASK | BTA_HFP_SERVICE_MASK | BTA_A2DP_SERVICE_MASK | BTA_HID_SERVICE_MASK | BTA_OPP_SERVICE_MASK | BTA_BPP_SERVICE_MASK)
-PBAP_ZERO_VCARD_IN_DB = FALSE
-BTA_DM_SDP_DB_SIZE = 8000
-MAX_L2CAP_CLIENTS = 15
-FTS_REJECT_INVALID_OBEX_SET_PATH_REQ = FALSE
-HID_HOST_MAX_CONN_RETRY = (3)
-BTM_DISC_DURING_RS = TRUE
-BTM_WBS_INCLUDED = FALSE
-HL_INCLUDED = TRUE
-NO_GKI_RUN_RETURN = TRUE
-AG_VOICE_SETTINGS = HCI_DEFAULT_VOICE_SETTINGS
-BTIF_DM_OOB_TEST = TRUE
diff --git a/include/bdroid_generic_x86.txt b/include/bdroid_generic_x86.txt
deleted file mode 100755
index 204b09f..0000000
--- a/include/bdroid_generic_x86.txt
+++ /dev/null
@@ -1,171 +0,0 @@
-AVCT_INCLUDED =  TRUE
-AVRC_INCLUDED = TRUE
-AVDT_INCLUDED = TRUE
-UNV_INCLUDED = FALSE
-A2D_INCLUDED = TRUE
-A2D_SBC_INCLUDED = TRUE
-DUN_INCLUDED = FALSE
-GAP_INCLUDED = FALSE
-GOEP_INCLUDED = FALSE
-GOEP_FS_INCLUDED = FALSE
-GATT_PTS = FALSE
-BTM_SEC_MAX_SERVICE_RECORDS = 32
-L2CAP_INCLUDED = TRUE
-L2CAP_LINK_INACTIVITY_TOUT = 4
-L2CAP_FCR_INCLUDED = TRUE
-L2CAP_EXTFEA_SUPPORTED_MASK = (L2CAP_EXTFEA_ENH_RETRANS | L2CAP_EXTFEA_STREAM_MODE | L2CAP_EXTFEA_NO_CRC | L2CAP_EXTFEA_FIXED_CHNLS)
-BTUI_OPS_FORMATS = (BTA_OP_VCARD21_MASK | BTA_OP_VCAL_MASK | BTA_OP_VNOTE_MASK | BTA_OP_ANY_MASK)
-RFCOMM_INCLUDED = TRUE
-MAX_RFC_PORTS = 30
-MAX_ACL_CONNECTIONS = 7
-MAX_L2CAP_CHANNELS = 16
-BTA_RFC_MTU_SIZE = (L2CAP_MTU_SIZE-L2CAP_MIN_OFFSET-RFCOMM_DATA_OVERHEAD)
-PORT_TX_BUF_HIGH_WM = 10
-PORT_RX_BUF_HIGH_WM = 10
-PORT_RX_BUF_LOW_WM = 4
-PORT_RX_BUF_CRITICAL_WM = 15
-PORT_TX_BUF_CRITICAL_WM = 15
-PORT_RX_LOW_WM = (BTA_RFC_MTU_SIZE * PORT_RX_BUF_LOW_WM)
-PORT_RX_HIGH_WM = (BTA_RFC_MTU_SIZE * PORT_RX_BUF_HIGH_WM)
-PORT_RX_CRITICAL_WM = (BTA_RFC_MTU_SIZE * PORT_RX_BUF_CRITICAL_WM)
-PORT_TX_HIGH_WM = (BTA_RFC_MTU_SIZE * PORT_TX_BUF_HIGH_WM)
-PORT_TX_CRITICAL_WM = (BTA_RFC_MTU_SIZE * PORT_TX_BUF_CRITICAL_WM)
-BTA_DUN_MTU = BTA_RFC_MTU_SIZE
-BTA_SPP_MTU = BTA_RFC_MTU_SIZE
-BTA_FAX_MTU = BTA_RFC_MTU_SIZE
-SDP_DI_INCLUDED = TRUE
-SDP_RAW_DATA_INCLUDED = TRUE
-SDP_RAW_PDU_INCLUDED = TRUE
-SDP_POOL_ID = 3
-SDP_MAX_REC_ATTR = 25
-SDP_MAX_ATTR_LEN = 400
-SDP_MAX_PAD_LEN = 600
-BNEP_INCLUDED = TRUE
-PAN_INCLUDED = TRUE
-HID_DEV_INCLUDED = FALSE
-HID_HOST_INCLUDED = TRUE
-BLE_INCLUDED = FALSE
-BTM_BLE_CONFORMANCE_TESTING = FALSE
-ATT_INCLUDED = FALSE
-ATT_DEBUG = FALSE
-GATTS_APPU_USE_GATT_TRACE = FALSE
-GATT_CLIENT_ENABLED = FALSE
-GATT_SERVER_ENABLED = FALSE
-SMP_INCLUDED = FALSE
-SMP_HOST_ENCRYPT_INCLUDED = FALSE
-SER_INCLUDED = FALSE
-RPC_INCLUDED = FALSE
-MMI_INCLUDED = FALSE
-SAP_INCLUDED = FALSE
-SBC_NO_PCM_CPY_OPTION = FALSE
-SBC_IPAQ_OPT = FALSE
-SBC_IS_64_MULT_IN_QUANTIZER = FALSE
-BTA_INCLUDED = TRUE
-BTA_AG_INCLUDED = TRUE
-BTA_CT_INCLUDED = FALSE
-BTA_CG_INCLUDED = FALSE
-BTA_DG_INCLUDED = FALSE
-BTA_FT_INCLUDED = FALSE
-BTA_OP_INCLUDED = FALSE
-BTA_PR_INCLUDED = FALSE
-BTA_SS_INCLUDED = FALSE
-BTA_DM_INCLUDED = TRUE
-BTA_DI_INCLUDED = FALSE
-BTA_BI_INCLUDED = FALSE
-BTA_SC_INCLUDED = FALSE
-BTA_PAN_INCLUDED = TRUE
-BTA_FS_INCLUDED = TRUE
-BTA_AC_INCLUDED = FALSE
-BTA_HD_INCLUDED = FALSE
-BTA_HH_INCLUDED = TRUE
-BTA_HH_ROLE = BTA_MASTER_ROLE_PREF
-BTA_AR_INCLUDED = TRUE
-BTA_AV_INCLUDED = TRUE
-BTA_AV_VDP_INCLUDED = FALSE
-BTA_AVK_INCLUDED = FALSE
-BTA_PBS_INCLUDED = FALSE
-BTA_PBC_INCLUDED = FALSE
-BTA_FM_INCLUDED = FALSE
-BTA_FM_DEBUG = FALSE
-BTA_FMTX_INCLUDED = FALSE
-BTA_FMTX_DEBUG = FALSE
-BTA_FMTX_FMRX_SWITCH_WORKAROUND = FALSE
-BTA_FMTX_US_FCC_RULES = FALSE
-BTA_HS_INCLUDED = FALSE
-BTA_MSE_INCLUDED = FALSE
-BTA_MCE_INCLUDED = FALSE
-BTA_PLAYBACK_INCLUDED = FALSE
-BTA_SSR_INCLUDED = FALSE
-BTA_JV_INCLUDED = FALSE
-BTA_EIR_CANNED_UUID_LIST = FALSE
-BTA_GATT_INCLUDED = FALSE
-RSI_INCLUDED = TRUE
-RPC_TRACE_ONLY = FALSE
-ANDROID_APP_INCLUDED = TRUE
-ANDROID_USE_LOGCAT = TRUE
-LINUX_GKI_INCLUDED = TRUE
-TICKS_PER_SEC = 100
-QUICK_TIMER_TICKS_PER_SEC = 10
-BTA_SYS_TIMER_PERIOD = 100
-GKI_BUF1_SIZE = 288
-GKI_BUF3_MAX = 200
-GKI_BUF3_SIZE = (4096+16)
-GKI_BUF4_SIZE = (8080+26)
-GKI_SHUTDOWN_EVT = APPL_EVT_7
-GKI_PTHREAD_JOINABLE = TRUE
-LINUX_DRV_INCLUDED = TRUE
-LINUX_OS = TRUE
-BTU_TASK = 0
-BTIF_TASK = 1
-A2DP_MEDIA_TASK = 2
-GKI_MAX_TASKS = 3
-BTM_APP_DEV_INIT = bte_main_post_reset_init
-BTE_IDLE_TASK_INCLUDED = FALSE
-APPL_INCLUDED = TRUE
-BTU_BTA_INCLUDED = TRUE
-SBC_FOR_EMBEDDED_LINUX = TRUE
-BTA_DM_REMOTE_DEVICE_NAME_LENGTH = 248
-BTM_MAX_REM_BD_NAME_LEN = 248
-BTM_MAX_LOC_BD_NAME_LEN = 248
-BTM_USE_DEF_LOCAL_NAME = TRUE
-BTM_DEF_LOCAL_NAME = "Galaxy Nexus 2"
-BTM_INQ_DB_SIZE = 40
-BTM_SEC_MAX_DEVICE_RECORDS = 100
-BTM_SEC_FORCE_RNR_FOR_DBOND = FALSE
-BTM_AUTOMATIC_HCI_RESET = FALSE
-AVDT_VERSION = 0x0102
-BTA_AG_AT_MAX_LEN = 512
-BTA_AVRCP_FF_RW_SUPPORT = TRUE
-BTM_MAX_SCO_LINKS = 2
-BTA_AG_SCO_PKT_TYPES = (BTM_SCO_LINK_ONLY_MASK | BTM_SCO_PKT_TYPES_MASK_EV3 |  BTM_SCO_PKT_TYPES_MASK_NO_3_EV3 | BTM_SCO_PKT_TYPES_MASK_NO_2_EV5 | BTM_SCO_PKT_TYPES_MASK_NO_3_EV5)
-BTAPP_AV_SECMASK = (BTA_SEC_AUTHENTICATE | BTA_SEC_AUTHORIZE)
-BTA_AV_MAX_A2DP_MTU = 668
-BTA_AV_RET_TOUT = 15
-PORCHE_PAIRING_CONFLICT = TRUE
-BTA_AV_CO_CP_SCMS_T = FALSE
-AVDT_CONNECT_CP_ONLY = FALSE
-BTL_CFG_USE_CONF_FILE = FALSE
-BTAPP_AHF_API_SUPPORT = TRUE
-HCILP_INCLUDED = TRUE
-HCISU_H4_INCLUDED = TRUE
-BT_TRACE_PROTOCOL = TRUE
-BT_USE_TRACES = TRUE
-BT_TRACE_BTIF = TRUE
-BTTRC_INCLUDED = FALSE
-BT_TRACE_VERBOSE = FALSE
-BTTRC_PARSER_INCLUDED = FALSE
-MAX_TRACE_RAM_SIZE = 10000
-OBX_INITIAL_TRACE_LEVEL = BT_TRACE_LEVEL_ERROR
-BTM_ALLOW_CONN_IF_NONDISCOVER = TRUE
-BTAPP_DM_SUPPORTED_SERVICES = (BTA_HSP_SERVICE_MASK | BTA_HFP_SERVICE_MASK | BTA_A2DP_SERVICE_MASK | BTA_HID_SERVICE_MASK | BTA_OPP_SERVICE_MASK | BTA_BPP_SERVICE_MASK)
-PBAP_ZERO_VCARD_IN_DB = FALSE
-BTA_DM_SDP_DB_SIZE = 8000
-MAX_L2CAP_CLIENTS = 15
-FTS_REJECT_INVALID_OBEX_SET_PATH_REQ = FALSE
-HID_HOST_MAX_CONN_RETRY = (3)
-BTM_DISC_DURING_RS = TRUE
-BTM_WBS_INCLUDED = FALSE
-HL_INCLUDED = TRUE
-NO_GKI_RUN_RETURN = TRUE
-AG_VOICE_SETTINGS = HCI_DEFAULT_VOICE_SETTINGS
-BTIF_DM_OOB_TEST = TRUE
diff --git a/include/bdroid_grouper.txt b/include/bdroid_grouper.txt
deleted file mode 100755
index cb8afbf..0000000
--- a/include/bdroid_grouper.txt
+++ /dev/null
@@ -1,176 +0,0 @@
-AVCT_INCLUDED =  TRUE
-AVRC_INCLUDED = TRUE
-AVDT_INCLUDED = TRUE
-UNV_INCLUDED = FALSE
-A2D_INCLUDED = TRUE
-A2D_SBC_INCLUDED = TRUE
-DUN_INCLUDED = FALSE
-GAP_INCLUDED = FALSE
-GOEP_INCLUDED = FALSE
-GOEP_FS_INCLUDED = FALSE
-GATT_PTS = FALSE
-BTM_SEC_MAX_SERVICE_RECORDS = 32
-L2CAP_INCLUDED = TRUE
-L2CAP_LINK_INACTIVITY_TOUT = 4
-L2CAP_FCR_INCLUDED = TRUE
-L2CAP_EXTFEA_SUPPORTED_MASK = (L2CAP_EXTFEA_ENH_RETRANS | L2CAP_EXTFEA_STREAM_MODE | L2CAP_EXTFEA_NO_CRC | L2CAP_EXTFEA_FIXED_CHNLS)
-BTUI_OPS_FORMATS = (BTA_OP_VCARD21_MASK | BTA_OP_VCAL_MASK | BTA_OP_VNOTE_MASK | BTA_OP_ANY_MASK)
-RFCOMM_INCLUDED = TRUE
-MAX_RFC_PORTS = 30
-MAX_ACL_CONNECTIONS = 7
-MAX_L2CAP_CHANNELS = 16
-BTA_RFC_MTU_SIZE = (L2CAP_MTU_SIZE-L2CAP_MIN_OFFSET-RFCOMM_DATA_OVERHEAD)
-PORT_TX_BUF_HIGH_WM = 10
-PORT_RX_BUF_HIGH_WM = 10
-PORT_RX_BUF_LOW_WM = 4
-PORT_RX_BUF_CRITICAL_WM = 15
-PORT_TX_BUF_CRITICAL_WM = 15
-PORT_RX_LOW_WM = (BTA_RFC_MTU_SIZE * PORT_RX_BUF_LOW_WM)
-PORT_RX_HIGH_WM = (BTA_RFC_MTU_SIZE * PORT_RX_BUF_HIGH_WM)
-PORT_RX_CRITICAL_WM = (BTA_RFC_MTU_SIZE * PORT_RX_BUF_CRITICAL_WM)
-PORT_TX_HIGH_WM = (BTA_RFC_MTU_SIZE * PORT_TX_BUF_HIGH_WM)
-PORT_TX_CRITICAL_WM = (BTA_RFC_MTU_SIZE * PORT_TX_BUF_CRITICAL_WM)
-BTA_DUN_MTU = BTA_RFC_MTU_SIZE
-BTA_SPP_MTU = BTA_RFC_MTU_SIZE
-BTA_FAX_MTU = BTA_RFC_MTU_SIZE
-SDP_DI_INCLUDED = TRUE
-SDP_RAW_DATA_INCLUDED = TRUE
-SDP_RAW_PDU_INCLUDED = TRUE
-SDP_POOL_ID = 3
-SDP_MAX_REC_ATTR = 25
-SDP_MAX_ATTR_LEN = 400
-SDP_MAX_PAD_LEN = 600
-BNEP_INCLUDED = TRUE
-PAN_INCLUDED = TRUE
-HID_DEV_INCLUDED = FALSE
-HID_HOST_INCLUDED = FALSE
-BLE_INCLUDED = FALSE
-BTM_BLE_CONFORMANCE_TESTING = FALSE
-ATT_INCLUDED = FALSE
-ATT_DEBUG = FALSE
-GATTS_APPU_USE_GATT_TRACE = FALSE
-GATT_CLIENT_ENABLED = FALSE
-GATT_SERVER_ENABLED = FALSE
-SMP_INCLUDED = FALSE
-SMP_HOST_ENCRYPT_INCLUDED = FALSE
-SER_INCLUDED = FALSE
-RPC_INCLUDED = FALSE
-MMI_INCLUDED = FALSE
-SAP_INCLUDED = FALSE
-SBC_NO_PCM_CPY_OPTION = FALSE
-SBC_IPAQ_OPT = FALSE
-SBC_IS_64_MULT_IN_QUANTIZER = FALSE
-BTA_INCLUDED = TRUE
-BTA_AG_INCLUDED = TRUE
-BTA_CT_INCLUDED = FALSE
-BTA_CG_INCLUDED = FALSE
-BTA_DG_INCLUDED = FALSE
-BTA_FT_INCLUDED = FALSE
-BTA_OP_INCLUDED = FALSE
-BTA_PR_INCLUDED = FALSE
-BTA_SS_INCLUDED = FALSE
-BTA_DM_INCLUDED = TRUE
-BTA_DI_INCLUDED = FALSE
-BTA_BI_INCLUDED = FALSE
-BTA_SC_INCLUDED = FALSE
-BTA_PAN_INCLUDED = TRUE
-PAN_NAP_DISABLED = TRUE
-BTA_FS_INCLUDED = TRUE
-BTA_AC_INCLUDED = FALSE
-BTA_HD_INCLUDED = FALSE
-BTA_HH_INCLUDED = TRUE
-BTA_HH_ROLE = BTA_MASTER_ROLE_PREF
-BTA_AR_INCLUDED = TRUE
-BTA_AV_INCLUDED = TRUE
-BTA_AV_VDP_INCLUDED = FALSE
-BTA_AVK_INCLUDED = FALSE
-BTA_PBS_INCLUDED = FALSE
-BTA_PBC_INCLUDED = FALSE
-BTA_FM_INCLUDED = FALSE
-BTA_FM_DEBUG = FALSE
-BTA_FMTX_INCLUDED = FALSE
-BTA_FMTX_DEBUG = FALSE
-BTA_FMTX_FMRX_SWITCH_WORKAROUND = FALSE
-BTA_FMTX_US_FCC_RULES = FALSE
-BTA_HS_INCLUDED = FALSE
-BTA_MSE_INCLUDED = FALSE
-BTA_MCE_INCLUDED = FALSE
-BTA_PLAYBACK_INCLUDED = FALSE
-BTA_SSR_INCLUDED = FALSE
-BTA_JV_INCLUDED = FALSE
-BTA_EIR_CANNED_UUID_LIST = FALSE
-BTA_GATT_INCLUDED = FALSE
-RSI_INCLUDED = TRUE
-RPC_TRACE_ONLY = FALSE
-ANDROID_APP_INCLUDED = TRUE
-ANDROID_USE_LOGCAT = TRUE
-LINUX_GKI_INCLUDED = TRUE
-TICKS_PER_SEC = 100
-QUICK_TIMER_TICKS_PER_SEC = 10
-BTA_SYS_TIMER_PERIOD = 100
-GKI_BUF1_SIZE = 288
-GKI_BUF3_MAX = 100
-GKI_BUF3_SIZE = (4096+16)
-GKI_BUF4_SIZE = (8080+26)
-GKI_SHUTDOWN_EVT = APPL_EVT_7
-GKI_PTHREAD_JOINABLE = TRUE
-LINUX_DRV_INCLUDED = TRUE
-LINUX_OS = TRUE
-BTU_TASK = 0
-BTIF_TASK = 1
-A2DP_MEDIA_TASK = 2
-GKI_MAX_TASKS = 3
-BTM_APP_DEV_INIT = bte_main_post_reset_init
-BTE_IDLE_TASK_INCLUDED = FALSE
-APPL_INCLUDED = TRUE
-BTU_BTA_INCLUDED = TRUE
-SBC_FOR_EMBEDDED_LINUX = TRUE
-BTA_DM_REMOTE_DEVICE_NAME_LENGTH = 248
-BTM_MAX_REM_BD_NAME_LEN = 248
-BTM_MAX_LOC_BD_NAME_LEN = 248
-BTM_USE_DEF_LOCAL_NAME = TRUE
-BTM_DEF_LOCAL_NAME = "Nexus 7"
-BTM_INQ_DB_SIZE = 40
-BTM_SEC_MAX_DEVICE_RECORDS = 100
-BTM_SEC_FORCE_RNR_FOR_DBOND = FALSE
-BTM_AUTOMATIC_HCI_RESET = FALSE
-AVDT_VERSION = 0x0102
-BTA_AG_AT_MAX_LEN = 512
-BTA_AVRCP_FF_RW_SUPPORT = TRUE
-BTM_MAX_SCO_LINKS = 2
-BTA_AG_SCO_PKT_TYPES = (BTM_SCO_LINK_ONLY_MASK | BTM_SCO_PKT_TYPES_MASK_EV3 |  BTM_SCO_PKT_TYPES_MASK_NO_3_EV3 | BTM_SCO_PKT_TYPES_MASK_NO_2_EV5 | BTM_SCO_PKT_TYPES_MASK_NO_3_EV5)
-BTAPP_AV_SECMASK = (BTA_SEC_AUTHENTICATE | BTA_SEC_AUTHORIZE)
-BTA_AV_MAX_A2DP_MTU = 668
-BTA_AV_RET_TOUT = 15
-PORCHE_PAIRING_CONFLICT = TRUE
-BTA_AV_CO_CP_SCMS_T = FALSE
-AVDT_CONNECT_CP_ONLY = FALSE
-BTL_CFG_USE_CONF_FILE = FALSE
-BTAPP_AHF_API_SUPPORT = TRUE
-HCILP_INCLUDED = TRUE
-HCISU_H4_INCLUDED = TRUE
-BT_TRACE_PROTOCOL = TRUE
-BT_USE_TRACES = TRUE
-BT_TRACE_BTIF = TRUE
-BTTRC_INCLUDED = FALSE
-BT_TRACE_VERBOSE = FALSE
-BTTRC_PARSER_INCLUDED = FALSE
-MAX_TRACE_RAM_SIZE = 10000
-OBX_INITIAL_TRACE_LEVEL = BT_TRACE_LEVEL_ERROR
-BTM_ALLOW_CONN_IF_NONDISCOVER = TRUE
-BTAPP_DM_SUPPORTED_SERVICES = (BTA_HSP_SERVICE_MASK | BTA_HFP_SERVICE_MASK | BTA_A2DP_SERVICE_MASK | BTA_HID_SERVICE_MASK | BTA_OPP_SERVICE_MASK | BTA_BPP_SERVICE_MASK)
-PBAP_ZERO_VCARD_IN_DB = FALSE
-BTA_DM_SDP_DB_SIZE = 8000
-MAX_L2CAP_CLIENTS = 15
-FTS_REJECT_INVALID_OBEX_SET_PATH_REQ = FALSE
-HID_HOST_MAX_CONN_RETRY = (3)
-BTM_DISC_DURING_RS = TRUE
-BTM_WBS_INCLUDED = FALSE
-HL_INCLUDED = TRUE
-NO_GKI_RUN_RETURN = TRUE
-AG_VOICE_SETTINGS = HCI_DEFAULT_VOICE_SETTINGS
-BTIF_DM_OOB_TEST = TRUE
-BTIF_HSAG_SERVICE_NAME = ("Headset Gateway")
-BTIF_HFAG_SERVICE_NAME = ("Handsfree Gateway")
-BTIF_HF_SERVICES = (BTA_HSP_SERVICE_MASK)
-BTIF_HF_SERVICE_NAMES = { BTIF_HSAG_SERVICE_NAME }
diff --git a/include/bdroid_maguro.txt b/include/bdroid_maguro.txt
deleted file mode 100755
index ccb2d25..0000000
--- a/include/bdroid_maguro.txt
+++ /dev/null
@@ -1,170 +0,0 @@
-AVCT_INCLUDED =  TRUE
-AVRC_INCLUDED = TRUE
-AVDT_INCLUDED = TRUE
-UNV_INCLUDED = FALSE
-A2D_INCLUDED = TRUE
-A2D_SBC_INCLUDED = TRUE
-DUN_INCLUDED = FALSE
-GAP_INCLUDED = FALSE
-GOEP_INCLUDED = FALSE
-GOEP_FS_INCLUDED = FALSE
-GATT_PTS = FALSE
-BTM_SEC_MAX_SERVICE_RECORDS = 32
-L2CAP_INCLUDED = TRUE
-L2CAP_LINK_INACTIVITY_TOUT = 4
-L2CAP_FCR_INCLUDED = TRUE
-L2CAP_EXTFEA_SUPPORTED_MASK = (L2CAP_EXTFEA_ENH_RETRANS | L2CAP_EXTFEA_STREAM_MODE | L2CAP_EXTFEA_NO_CRC | L2CAP_EXTFEA_FIXED_CHNLS)
-BTUI_OPS_FORMATS = (BTA_OP_VCARD21_MASK | BTA_OP_VCAL_MASK | BTA_OP_VNOTE_MASK | BTA_OP_ANY_MASK)
-RFCOMM_INCLUDED = TRUE
-MAX_RFC_PORTS = 30
-MAX_ACL_CONNECTIONS = 7
-MAX_L2CAP_CHANNELS = 16
-BTA_RFC_MTU_SIZE = (L2CAP_MTU_SIZE-L2CAP_MIN_OFFSET-RFCOMM_DATA_OVERHEAD)
-PORT_TX_BUF_HIGH_WM = 10
-PORT_RX_BUF_HIGH_WM = 10
-PORT_RX_BUF_LOW_WM = 4
-PORT_RX_BUF_CRITICAL_WM = 15
-PORT_TX_BUF_CRITICAL_WM = 15
-PORT_RX_LOW_WM = (BTA_RFC_MTU_SIZE * PORT_RX_BUF_LOW_WM)
-PORT_RX_HIGH_WM = (BTA_RFC_MTU_SIZE * PORT_RX_BUF_HIGH_WM)
-PORT_RX_CRITICAL_WM = (BTA_RFC_MTU_SIZE * PORT_RX_BUF_CRITICAL_WM)
-PORT_TX_HIGH_WM = (BTA_RFC_MTU_SIZE * PORT_TX_BUF_HIGH_WM)
-PORT_TX_CRITICAL_WM = (BTA_RFC_MTU_SIZE * PORT_TX_BUF_CRITICAL_WM)
-BTA_DUN_MTU = BTA_RFC_MTU_SIZE
-BTA_SPP_MTU = BTA_RFC_MTU_SIZE
-BTA_FAX_MTU = BTA_RFC_MTU_SIZE
-SDP_DI_INCLUDED = TRUE
-SDP_RAW_DATA_INCLUDED = TRUE
-SDP_RAW_PDU_INCLUDED = TRUE
-SDP_POOL_ID = 3
-SDP_MAX_REC_ATTR = 25
-SDP_MAX_ATTR_LEN = 400
-SDP_MAX_PAD_LEN = 600
-BNEP_INCLUDED = TRUE
-PAN_INCLUDED = TRUE
-HID_DEV_INCLUDED = FALSE
-HID_HOST_INCLUDED = TRUE
-BLE_INCLUDED = FALSE
-BTM_BLE_CONFORMANCE_TESTING = FALSE
-ATT_INCLUDED = FALSE
-ATT_DEBUG = FALSE
-GATTS_APPU_USE_GATT_TRACE = FALSE
-GATT_CLIENT_ENABLED = FALSE
-GATT_SERVER_ENABLED = FALSE
-SMP_INCLUDED = FALSE
-SMP_HOST_ENCRYPT_INCLUDED = FALSE
-SER_INCLUDED = FALSE
-RPC_INCLUDED = FALSE
-MMI_INCLUDED = FALSE
-SAP_INCLUDED = FALSE
-SBC_NO_PCM_CPY_OPTION = FALSE
-SBC_IPAQ_OPT = FALSE
-SBC_IS_64_MULT_IN_QUANTIZER = FALSE
-BTA_INCLUDED = TRUE
-BTA_AG_INCLUDED = TRUE
-BTA_CT_INCLUDED = FALSE
-BTA_CG_INCLUDED = FALSE
-BTA_DG_INCLUDED = FALSE
-BTA_FT_INCLUDED = FALSE
-BTA_OP_INCLUDED = FALSE
-BTA_PR_INCLUDED = FALSE
-BTA_SS_INCLUDED = FALSE
-BTA_DM_INCLUDED = TRUE
-BTA_DI_INCLUDED = FALSE
-BTA_BI_INCLUDED = FALSE
-BTA_SC_INCLUDED = FALSE
-BTA_PAN_INCLUDED = TRUE
-BTA_FS_INCLUDED = TRUE
-BTA_AC_INCLUDED = FALSE
-BTA_HD_INCLUDED = FALSE
-BTA_HH_INCLUDED = TRUE
-BTA_HH_ROLE = BTA_MASTER_ROLE_PREF
-BTA_AR_INCLUDED = TRUE
-BTA_AV_INCLUDED = TRUE
-BTA_AV_VDP_INCLUDED = FALSE
-BTA_AVK_INCLUDED = FALSE
-BTA_PBS_INCLUDED = FALSE
-BTA_PBC_INCLUDED = FALSE
-BTA_FM_INCLUDED = FALSE
-BTA_FM_DEBUG = FALSE
-BTA_FMTX_INCLUDED = FALSE
-BTA_FMTX_DEBUG = FALSE
-BTA_FMTX_FMRX_SWITCH_WORKAROUND = FALSE
-BTA_FMTX_US_FCC_RULES = FALSE
-BTA_HS_INCLUDED = FALSE
-BTA_MSE_INCLUDED = FALSE
-BTA_MCE_INCLUDED = FALSE
-BTA_PLAYBACK_INCLUDED = FALSE
-BTA_SSR_INCLUDED = FALSE
-BTA_JV_INCLUDED = FALSE
-BTA_EIR_CANNED_UUID_LIST = FALSE
-BTA_GATT_INCLUDED = FALSE
-RSI_INCLUDED = TRUE
-RPC_TRACE_ONLY = FALSE
-ANDROID_APP_INCLUDED = TRUE
-ANDROID_USE_LOGCAT = TRUE
-LINUX_GKI_INCLUDED = TRUE
-TICKS_PER_SEC = 100
-QUICK_TIMER_TICKS_PER_SEC = 10
-BTA_SYS_TIMER_PERIOD = 100
-GKI_BUF1_SIZE = 288
-GKI_BUF3_MAX = 200
-GKI_BUF3_SIZE = (4096+16)
-GKI_BUF4_SIZE = (8080+26)
-GKI_SHUTDOWN_EVT = APPL_EVT_7
-GKI_PTHREAD_JOINABLE = TRUE
-LINUX_DRV_INCLUDED = TRUE
-LINUX_OS = TRUE
-BTU_TASK = 0
-BTIF_TASK = 1
-A2DP_MEDIA_TASK = 2
-GKI_MAX_TASKS = 3
-BTM_APP_DEV_INIT = bte_main_post_reset_init
-BTE_IDLE_TASK_INCLUDED = FALSE
-APPL_INCLUDED = TRUE
-BTU_BTA_INCLUDED = TRUE
-SBC_FOR_EMBEDDED_LINUX = TRUE
-BTA_DM_REMOTE_DEVICE_NAME_LENGTH = 248
-BTM_MAX_REM_BD_NAME_LEN = 248
-BTM_MAX_LOC_BD_NAME_LEN = 248
-BTM_USE_DEF_LOCAL_NAME = TRUE
-BTM_DEF_LOCAL_NAME = "Galaxy Nexus 2"
-BTM_INQ_DB_SIZE = 40
-BTM_SEC_MAX_DEVICE_RECORDS = 100
-BTM_SEC_FORCE_RNR_FOR_DBOND = FALSE
-BTM_AUTOMATIC_HCI_RESET = FALSE
-AVDT_VERSION = 0x0102
-BTA_AG_AT_MAX_LEN = 512
-BTA_AVRCP_FF_RW_SUPPORT = TRUE
-BTM_MAX_SCO_LINKS = 2
-BTA_AG_SCO_PKT_TYPES = (BTM_SCO_LINK_ONLY_MASK | BTM_SCO_PKT_TYPES_MASK_EV3 |  BTM_SCO_PKT_TYPES_MASK_NO_3_EV3 | BTM_SCO_PKT_TYPES_MASK_NO_2_EV5 | BTM_SCO_PKT_TYPES_MASK_NO_3_EV5)
-BTAPP_AV_SECMASK = (BTA_SEC_AUTHENTICATE | BTA_SEC_AUTHORIZE)
-BTA_AV_MAX_A2DP_MTU = 668
-PORCHE_PAIRING_CONFLICT = TRUE
-BTA_AV_CO_CP_SCMS_T = FALSE
-AVDT_CONNECT_CP_ONLY = FALSE
-BTL_CFG_USE_CONF_FILE = FALSE
-BTAPP_AHF_API_SUPPORT = TRUE
-HCILP_INCLUDED = TRUE
-HCISU_H4_INCLUDED = TRUE
-BT_TRACE_PROTOCOL = TRUE
-BT_USE_TRACES = TRUE
-BT_TRACE_BTIF = TRUE
-BTTRC_INCLUDED = FALSE
-BT_TRACE_VERBOSE = FALSE
-BTTRC_PARSER_INCLUDED = FALSE
-MAX_TRACE_RAM_SIZE = 10000
-OBX_INITIAL_TRACE_LEVEL = BT_TRACE_LEVEL_ERROR
-BTM_ALLOW_CONN_IF_NONDISCOVER = TRUE
-BTAPP_DM_SUPPORTED_SERVICES = (BTA_HSP_SERVICE_MASK | BTA_HFP_SERVICE_MASK | BTA_A2DP_SERVICE_MASK | BTA_HID_SERVICE_MASK | BTA_OPP_SERVICE_MASK | BTA_BPP_SERVICE_MASK)
-PBAP_ZERO_VCARD_IN_DB = FALSE
-BTA_DM_SDP_DB_SIZE = 8000
-MAX_L2CAP_CLIENTS = 15
-FTS_REJECT_INVALID_OBEX_SET_PATH_REQ = FALSE
-HID_HOST_MAX_CONN_RETRY = (3)
-BTM_DISC_DURING_RS = TRUE
-BTM_WBS_INCLUDED = FALSE
-HL_INCLUDED = TRUE
-NO_GKI_RUN_RETURN = TRUE
-AG_VOICE_SETTINGS = HCI_DEFAULT_VOICE_SETTINGS
-BTIF_DM_OOB_TEST = TRUE
diff --git a/include/bdroid_manta.txt b/include/bdroid_manta.txt
deleted file mode 100755
index a02ebb1..0000000
--- a/include/bdroid_manta.txt
+++ /dev/null
@@ -1,176 +0,0 @@
-AVCT_INCLUDED =  TRUE
-AVRC_INCLUDED = TRUE
-AVDT_INCLUDED = TRUE
-UNV_INCLUDED = FALSE
-A2D_INCLUDED = TRUE
-A2D_SBC_INCLUDED = TRUE
-DUN_INCLUDED = FALSE
-GAP_INCLUDED = FALSE
-GOEP_INCLUDED = FALSE
-GOEP_FS_INCLUDED = FALSE
-GATT_PTS = FALSE
-BTM_SEC_MAX_SERVICE_RECORDS = 32
-L2CAP_INCLUDED = TRUE
-L2CAP_LINK_INACTIVITY_TOUT = 4
-L2CAP_FCR_INCLUDED = TRUE
-L2CAP_EXTFEA_SUPPORTED_MASK = (L2CAP_EXTFEA_ENH_RETRANS | L2CAP_EXTFEA_STREAM_MODE | L2CAP_EXTFEA_NO_CRC | L2CAP_EXTFEA_FIXED_CHNLS)
-BTUI_OPS_FORMATS = (BTA_OP_VCARD21_MASK | BTA_OP_VCAL_MASK | BTA_OP_VNOTE_MASK | BTA_OP_ANY_MASK)
-RFCOMM_INCLUDED = TRUE
-MAX_RFC_PORTS = 30
-MAX_ACL_CONNECTIONS = 7
-MAX_L2CAP_CHANNELS = 16
-BTA_RFC_MTU_SIZE = (L2CAP_MTU_SIZE-L2CAP_MIN_OFFSET-RFCOMM_DATA_OVERHEAD)
-PORT_TX_BUF_HIGH_WM = 10
-PORT_RX_BUF_HIGH_WM = 10
-PORT_RX_BUF_LOW_WM = 4
-PORT_RX_BUF_CRITICAL_WM = 15
-PORT_TX_BUF_CRITICAL_WM = 15
-PORT_RX_LOW_WM = (BTA_RFC_MTU_SIZE * PORT_RX_BUF_LOW_WM)
-PORT_RX_HIGH_WM = (BTA_RFC_MTU_SIZE * PORT_RX_BUF_HIGH_WM)
-PORT_RX_CRITICAL_WM = (BTA_RFC_MTU_SIZE * PORT_RX_BUF_CRITICAL_WM)
-PORT_TX_HIGH_WM = (BTA_RFC_MTU_SIZE * PORT_TX_BUF_HIGH_WM)
-PORT_TX_CRITICAL_WM = (BTA_RFC_MTU_SIZE * PORT_TX_BUF_CRITICAL_WM)
-BTA_DUN_MTU = BTA_RFC_MTU_SIZE
-BTA_SPP_MTU = BTA_RFC_MTU_SIZE
-BTA_FAX_MTU = BTA_RFC_MTU_SIZE
-SDP_DI_INCLUDED = TRUE
-SDP_RAW_DATA_INCLUDED = TRUE
-SDP_RAW_PDU_INCLUDED = TRUE
-SDP_POOL_ID = 3
-SDP_MAX_REC_ATTR = 25
-SDP_MAX_ATTR_LEN = 400
-SDP_MAX_PAD_LEN = 600
-BNEP_INCLUDED = TRUE
-PAN_INCLUDED = TRUE
-HID_DEV_INCLUDED = FALSE
-HID_HOST_INCLUDED = FALSE
-BLE_INCLUDED = FALSE
-BTM_BLE_CONFORMANCE_TESTING = FALSE
-ATT_INCLUDED = FALSE
-ATT_DEBUG = FALSE
-GATTS_APPU_USE_GATT_TRACE = FALSE
-GATT_CLIENT_ENABLED = FALSE
-GATT_SERVER_ENABLED = FALSE
-SMP_INCLUDED = FALSE
-SMP_HOST_ENCRYPT_INCLUDED = FALSE
-SER_INCLUDED = FALSE
-RPC_INCLUDED = FALSE
-MMI_INCLUDED = FALSE
-SAP_INCLUDED = FALSE
-SBC_NO_PCM_CPY_OPTION = FALSE
-SBC_IPAQ_OPT = FALSE
-SBC_IS_64_MULT_IN_QUANTIZER = FALSE
-BTA_INCLUDED = TRUE
-BTA_AG_INCLUDED = TRUE
-BTA_CT_INCLUDED = FALSE
-BTA_CG_INCLUDED = FALSE
-BTA_DG_INCLUDED = FALSE
-BTA_FT_INCLUDED = FALSE
-BTA_OP_INCLUDED = FALSE
-BTA_PR_INCLUDED = FALSE
-BTA_SS_INCLUDED = FALSE
-BTA_DM_INCLUDED = TRUE
-BTA_DI_INCLUDED = FALSE
-BTA_BI_INCLUDED = FALSE
-BTA_SC_INCLUDED = FALSE
-BTA_PAN_INCLUDED = TRUE
-PAN_NAP_DISABLED = TRUE
-BTA_FS_INCLUDED = TRUE
-BTA_AC_INCLUDED = FALSE
-BTA_HD_INCLUDED = FALSE
-BTA_HH_INCLUDED = TRUE
-BTA_HH_ROLE = BTA_MASTER_ROLE_PREF
-BTA_AR_INCLUDED = TRUE
-BTA_AV_INCLUDED = TRUE
-BTA_AV_VDP_INCLUDED = FALSE
-BTA_AVK_INCLUDED = FALSE
-BTA_PBS_INCLUDED = FALSE
-BTA_PBC_INCLUDED = FALSE
-BTA_FM_INCLUDED = FALSE
-BTA_FM_DEBUG = FALSE
-BTA_FMTX_INCLUDED = FALSE
-BTA_FMTX_DEBUG = FALSE
-BTA_FMTX_FMRX_SWITCH_WORKAROUND = FALSE
-BTA_FMTX_US_FCC_RULES = FALSE
-BTA_HS_INCLUDED = FALSE
-BTA_MSE_INCLUDED = FALSE
-BTA_MCE_INCLUDED = FALSE
-BTA_PLAYBACK_INCLUDED = FALSE
-BTA_SSR_INCLUDED = FALSE
-BTA_JV_INCLUDED = FALSE
-BTA_EIR_CANNED_UUID_LIST = FALSE
-BTA_GATT_INCLUDED = FALSE
-RSI_INCLUDED = TRUE
-RPC_TRACE_ONLY = FALSE
-ANDROID_APP_INCLUDED = TRUE
-ANDROID_USE_LOGCAT = TRUE
-LINUX_GKI_INCLUDED = TRUE
-TICKS_PER_SEC = 100
-QUICK_TIMER_TICKS_PER_SEC = 10
-BTA_SYS_TIMER_PERIOD = 100
-GKI_BUF1_SIZE = 288
-GKI_BUF3_MAX = 100
-GKI_BUF3_SIZE = (4096+16)
-GKI_BUF4_SIZE = (8080+26)
-GKI_SHUTDOWN_EVT = APPL_EVT_7
-GKI_PTHREAD_JOINABLE = TRUE
-LINUX_DRV_INCLUDED = TRUE
-LINUX_OS = TRUE
-BTU_TASK = 0
-BTIF_TASK = 1
-A2DP_MEDIA_TASK = 2
-GKI_MAX_TASKS = 3
-BTM_APP_DEV_INIT = bte_main_post_reset_init
-BTE_IDLE_TASK_INCLUDED = FALSE
-APPL_INCLUDED = TRUE
-BTU_BTA_INCLUDED = TRUE
-SBC_FOR_EMBEDDED_LINUX = TRUE
-BTA_DM_REMOTE_DEVICE_NAME_LENGTH = 248
-BTM_MAX_REM_BD_NAME_LEN = 248
-BTM_MAX_LOC_BD_NAME_LEN = 248
-BTM_USE_DEF_LOCAL_NAME = TRUE
-BTM_DEF_LOCAL_NAME = "Nexus Tablet"
-BTM_INQ_DB_SIZE = 40
-BTM_SEC_MAX_DEVICE_RECORDS = 100
-BTM_SEC_FORCE_RNR_FOR_DBOND = FALSE
-BTM_AUTOMATIC_HCI_RESET = FALSE
-AVDT_VERSION = 0x0102
-BTA_AG_AT_MAX_LEN = 512
-BTA_AVRCP_FF_RW_SUPPORT = TRUE
-BTM_MAX_SCO_LINKS = 2
-BTA_AG_SCO_PKT_TYPES = (BTM_SCO_LINK_ONLY_MASK | BTM_SCO_PKT_TYPES_MASK_EV3 |  BTM_SCO_PKT_TYPES_MASK_NO_3_EV3 | BTM_SCO_PKT_TYPES_MASK_NO_2_EV5 | BTM_SCO_PKT_TYPES_MASK_NO_3_EV5)
-BTAPP_AV_SECMASK = (BTA_SEC_AUTHENTICATE | BTA_SEC_AUTHORIZE)
-BTA_AV_MAX_A2DP_MTU = 668
-BTA_AV_RET_TOUT = 15
-PORCHE_PAIRING_CONFLICT = TRUE
-BTA_AV_CO_CP_SCMS_T = FALSE
-AVDT_CONNECT_CP_ONLY = FALSE
-BTL_CFG_USE_CONF_FILE = FALSE
-BTAPP_AHF_API_SUPPORT = TRUE
-HCILP_INCLUDED = TRUE
-HCISU_H4_INCLUDED = TRUE
-BT_TRACE_PROTOCOL = TRUE
-BT_USE_TRACES = TRUE
-BT_TRACE_BTIF = TRUE
-BTTRC_INCLUDED = FALSE
-BT_TRACE_VERBOSE = FALSE
-BTTRC_PARSER_INCLUDED = FALSE
-MAX_TRACE_RAM_SIZE = 10000
-OBX_INITIAL_TRACE_LEVEL = BT_TRACE_LEVEL_ERROR
-BTM_ALLOW_CONN_IF_NONDISCOVER = TRUE
-BTAPP_DM_SUPPORTED_SERVICES = (BTA_HSP_SERVICE_MASK | BTA_HFP_SERVICE_MASK | BTA_A2DP_SERVICE_MASK | BTA_HID_SERVICE_MASK | BTA_OPP_SERVICE_MASK | BTA_BPP_SERVICE_MASK)
-PBAP_ZERO_VCARD_IN_DB = FALSE
-BTA_DM_SDP_DB_SIZE = 8000
-MAX_L2CAP_CLIENTS = 15
-FTS_REJECT_INVALID_OBEX_SET_PATH_REQ = FALSE
-HID_HOST_MAX_CONN_RETRY = (3)
-BTM_DISC_DURING_RS = TRUE
-BTM_WBS_INCLUDED = FALSE
-HL_INCLUDED = TRUE
-NO_GKI_RUN_RETURN = TRUE
-AG_VOICE_SETTINGS = HCI_DEFAULT_VOICE_SETTINGS
-BTIF_DM_OOB_TEST = TRUE
-BTIF_HSAG_SERVICE_NAME = ("Headset Gateway")
-BTIF_HFAG_SERVICE_NAME = ("Handsfree Gateway")
-BTIF_HF_SERVICES = (BTA_HSP_SERVICE_MASK)
-BTIF_HF_SERVICE_NAMES = { BTIF_HSAG_SERVICE_NAME }
diff --git a/include/bdroid_panda.txt b/include/bdroid_panda.txt
deleted file mode 100755
index 204b09f..0000000
--- a/include/bdroid_panda.txt
+++ /dev/null
@@ -1,171 +0,0 @@
-AVCT_INCLUDED =  TRUE
-AVRC_INCLUDED = TRUE
-AVDT_INCLUDED = TRUE
-UNV_INCLUDED = FALSE
-A2D_INCLUDED = TRUE
-A2D_SBC_INCLUDED = TRUE
-DUN_INCLUDED = FALSE
-GAP_INCLUDED = FALSE
-GOEP_INCLUDED = FALSE
-GOEP_FS_INCLUDED = FALSE
-GATT_PTS = FALSE
-BTM_SEC_MAX_SERVICE_RECORDS = 32
-L2CAP_INCLUDED = TRUE
-L2CAP_LINK_INACTIVITY_TOUT = 4
-L2CAP_FCR_INCLUDED = TRUE
-L2CAP_EXTFEA_SUPPORTED_MASK = (L2CAP_EXTFEA_ENH_RETRANS | L2CAP_EXTFEA_STREAM_MODE | L2CAP_EXTFEA_NO_CRC | L2CAP_EXTFEA_FIXED_CHNLS)
-BTUI_OPS_FORMATS = (BTA_OP_VCARD21_MASK | BTA_OP_VCAL_MASK | BTA_OP_VNOTE_MASK | BTA_OP_ANY_MASK)
-RFCOMM_INCLUDED = TRUE
-MAX_RFC_PORTS = 30
-MAX_ACL_CONNECTIONS = 7
-MAX_L2CAP_CHANNELS = 16
-BTA_RFC_MTU_SIZE = (L2CAP_MTU_SIZE-L2CAP_MIN_OFFSET-RFCOMM_DATA_OVERHEAD)
-PORT_TX_BUF_HIGH_WM = 10
-PORT_RX_BUF_HIGH_WM = 10
-PORT_RX_BUF_LOW_WM = 4
-PORT_RX_BUF_CRITICAL_WM = 15
-PORT_TX_BUF_CRITICAL_WM = 15
-PORT_RX_LOW_WM = (BTA_RFC_MTU_SIZE * PORT_RX_BUF_LOW_WM)
-PORT_RX_HIGH_WM = (BTA_RFC_MTU_SIZE * PORT_RX_BUF_HIGH_WM)
-PORT_RX_CRITICAL_WM = (BTA_RFC_MTU_SIZE * PORT_RX_BUF_CRITICAL_WM)
-PORT_TX_HIGH_WM = (BTA_RFC_MTU_SIZE * PORT_TX_BUF_HIGH_WM)
-PORT_TX_CRITICAL_WM = (BTA_RFC_MTU_SIZE * PORT_TX_BUF_CRITICAL_WM)
-BTA_DUN_MTU = BTA_RFC_MTU_SIZE
-BTA_SPP_MTU = BTA_RFC_MTU_SIZE
-BTA_FAX_MTU = BTA_RFC_MTU_SIZE
-SDP_DI_INCLUDED = TRUE
-SDP_RAW_DATA_INCLUDED = TRUE
-SDP_RAW_PDU_INCLUDED = TRUE
-SDP_POOL_ID = 3
-SDP_MAX_REC_ATTR = 25
-SDP_MAX_ATTR_LEN = 400
-SDP_MAX_PAD_LEN = 600
-BNEP_INCLUDED = TRUE
-PAN_INCLUDED = TRUE
-HID_DEV_INCLUDED = FALSE
-HID_HOST_INCLUDED = TRUE
-BLE_INCLUDED = FALSE
-BTM_BLE_CONFORMANCE_TESTING = FALSE
-ATT_INCLUDED = FALSE
-ATT_DEBUG = FALSE
-GATTS_APPU_USE_GATT_TRACE = FALSE
-GATT_CLIENT_ENABLED = FALSE
-GATT_SERVER_ENABLED = FALSE
-SMP_INCLUDED = FALSE
-SMP_HOST_ENCRYPT_INCLUDED = FALSE
-SER_INCLUDED = FALSE
-RPC_INCLUDED = FALSE
-MMI_INCLUDED = FALSE
-SAP_INCLUDED = FALSE
-SBC_NO_PCM_CPY_OPTION = FALSE
-SBC_IPAQ_OPT = FALSE
-SBC_IS_64_MULT_IN_QUANTIZER = FALSE
-BTA_INCLUDED = TRUE
-BTA_AG_INCLUDED = TRUE
-BTA_CT_INCLUDED = FALSE
-BTA_CG_INCLUDED = FALSE
-BTA_DG_INCLUDED = FALSE
-BTA_FT_INCLUDED = FALSE
-BTA_OP_INCLUDED = FALSE
-BTA_PR_INCLUDED = FALSE
-BTA_SS_INCLUDED = FALSE
-BTA_DM_INCLUDED = TRUE
-BTA_DI_INCLUDED = FALSE
-BTA_BI_INCLUDED = FALSE
-BTA_SC_INCLUDED = FALSE
-BTA_PAN_INCLUDED = TRUE
-BTA_FS_INCLUDED = TRUE
-BTA_AC_INCLUDED = FALSE
-BTA_HD_INCLUDED = FALSE
-BTA_HH_INCLUDED = TRUE
-BTA_HH_ROLE = BTA_MASTER_ROLE_PREF
-BTA_AR_INCLUDED = TRUE
-BTA_AV_INCLUDED = TRUE
-BTA_AV_VDP_INCLUDED = FALSE
-BTA_AVK_INCLUDED = FALSE
-BTA_PBS_INCLUDED = FALSE
-BTA_PBC_INCLUDED = FALSE
-BTA_FM_INCLUDED = FALSE
-BTA_FM_DEBUG = FALSE
-BTA_FMTX_INCLUDED = FALSE
-BTA_FMTX_DEBUG = FALSE
-BTA_FMTX_FMRX_SWITCH_WORKAROUND = FALSE
-BTA_FMTX_US_FCC_RULES = FALSE
-BTA_HS_INCLUDED = FALSE
-BTA_MSE_INCLUDED = FALSE
-BTA_MCE_INCLUDED = FALSE
-BTA_PLAYBACK_INCLUDED = FALSE
-BTA_SSR_INCLUDED = FALSE
-BTA_JV_INCLUDED = FALSE
-BTA_EIR_CANNED_UUID_LIST = FALSE
-BTA_GATT_INCLUDED = FALSE
-RSI_INCLUDED = TRUE
-RPC_TRACE_ONLY = FALSE
-ANDROID_APP_INCLUDED = TRUE
-ANDROID_USE_LOGCAT = TRUE
-LINUX_GKI_INCLUDED = TRUE
-TICKS_PER_SEC = 100
-QUICK_TIMER_TICKS_PER_SEC = 10
-BTA_SYS_TIMER_PERIOD = 100
-GKI_BUF1_SIZE = 288
-GKI_BUF3_MAX = 200
-GKI_BUF3_SIZE = (4096+16)
-GKI_BUF4_SIZE = (8080+26)
-GKI_SHUTDOWN_EVT = APPL_EVT_7
-GKI_PTHREAD_JOINABLE = TRUE
-LINUX_DRV_INCLUDED = TRUE
-LINUX_OS = TRUE
-BTU_TASK = 0
-BTIF_TASK = 1
-A2DP_MEDIA_TASK = 2
-GKI_MAX_TASKS = 3
-BTM_APP_DEV_INIT = bte_main_post_reset_init
-BTE_IDLE_TASK_INCLUDED = FALSE
-APPL_INCLUDED = TRUE
-BTU_BTA_INCLUDED = TRUE
-SBC_FOR_EMBEDDED_LINUX = TRUE
-BTA_DM_REMOTE_DEVICE_NAME_LENGTH = 248
-BTM_MAX_REM_BD_NAME_LEN = 248
-BTM_MAX_LOC_BD_NAME_LEN = 248
-BTM_USE_DEF_LOCAL_NAME = TRUE
-BTM_DEF_LOCAL_NAME = "Galaxy Nexus 2"
-BTM_INQ_DB_SIZE = 40
-BTM_SEC_MAX_DEVICE_RECORDS = 100
-BTM_SEC_FORCE_RNR_FOR_DBOND = FALSE
-BTM_AUTOMATIC_HCI_RESET = FALSE
-AVDT_VERSION = 0x0102
-BTA_AG_AT_MAX_LEN = 512
-BTA_AVRCP_FF_RW_SUPPORT = TRUE
-BTM_MAX_SCO_LINKS = 2
-BTA_AG_SCO_PKT_TYPES = (BTM_SCO_LINK_ONLY_MASK | BTM_SCO_PKT_TYPES_MASK_EV3 |  BTM_SCO_PKT_TYPES_MASK_NO_3_EV3 | BTM_SCO_PKT_TYPES_MASK_NO_2_EV5 | BTM_SCO_PKT_TYPES_MASK_NO_3_EV5)
-BTAPP_AV_SECMASK = (BTA_SEC_AUTHENTICATE | BTA_SEC_AUTHORIZE)
-BTA_AV_MAX_A2DP_MTU = 668
-BTA_AV_RET_TOUT = 15
-PORCHE_PAIRING_CONFLICT = TRUE
-BTA_AV_CO_CP_SCMS_T = FALSE
-AVDT_CONNECT_CP_ONLY = FALSE
-BTL_CFG_USE_CONF_FILE = FALSE
-BTAPP_AHF_API_SUPPORT = TRUE
-HCILP_INCLUDED = TRUE
-HCISU_H4_INCLUDED = TRUE
-BT_TRACE_PROTOCOL = TRUE
-BT_USE_TRACES = TRUE
-BT_TRACE_BTIF = TRUE
-BTTRC_INCLUDED = FALSE
-BT_TRACE_VERBOSE = FALSE
-BTTRC_PARSER_INCLUDED = FALSE
-MAX_TRACE_RAM_SIZE = 10000
-OBX_INITIAL_TRACE_LEVEL = BT_TRACE_LEVEL_ERROR
-BTM_ALLOW_CONN_IF_NONDISCOVER = TRUE
-BTAPP_DM_SUPPORTED_SERVICES = (BTA_HSP_SERVICE_MASK | BTA_HFP_SERVICE_MASK | BTA_A2DP_SERVICE_MASK | BTA_HID_SERVICE_MASK | BTA_OPP_SERVICE_MASK | BTA_BPP_SERVICE_MASK)
-PBAP_ZERO_VCARD_IN_DB = FALSE
-BTA_DM_SDP_DB_SIZE = 8000
-MAX_L2CAP_CLIENTS = 15
-FTS_REJECT_INVALID_OBEX_SET_PATH_REQ = FALSE
-HID_HOST_MAX_CONN_RETRY = (3)
-BTM_DISC_DURING_RS = TRUE
-BTM_WBS_INCLUDED = FALSE
-HL_INCLUDED = TRUE
-NO_GKI_RUN_RETURN = TRUE
-AG_VOICE_SETTINGS = HCI_DEFAULT_VOICE_SETTINGS
-BTIF_DM_OOB_TEST = TRUE
diff --git a/include/bdroid_phantasm.txt b/include/bdroid_phantasm.txt
deleted file mode 100755
index 55c348d..0000000
--- a/include/bdroid_phantasm.txt
+++ /dev/null
@@ -1,171 +0,0 @@
-AVCT_INCLUDED =  TRUE
-AVRC_INCLUDED = TRUE
-AVDT_INCLUDED = TRUE
-UNV_INCLUDED = FALSE
-A2D_INCLUDED = TRUE
-A2D_SBC_INCLUDED = TRUE
-DUN_INCLUDED = FALSE
-GAP_INCLUDED = FALSE
-GOEP_INCLUDED = FALSE
-GOEP_FS_INCLUDED = FALSE
-GATT_PTS = FALSE
-BTM_SEC_MAX_SERVICE_RECORDS = 32
-L2CAP_INCLUDED = TRUE
-L2CAP_LINK_INACTIVITY_TOUT = 4
-L2CAP_FCR_INCLUDED = TRUE
-L2CAP_EXTFEA_SUPPORTED_MASK = (L2CAP_EXTFEA_ENH_RETRANS | L2CAP_EXTFEA_STREAM_MODE | L2CAP_EXTFEA_NO_CRC | L2CAP_EXTFEA_FIXED_CHNLS)
-BTUI_OPS_FORMATS = (BTA_OP_VCARD21_MASK | BTA_OP_VCAL_MASK | BTA_OP_VNOTE_MASK | BTA_OP_ANY_MASK)
-RFCOMM_INCLUDED = TRUE
-MAX_RFC_PORTS = 30
-MAX_ACL_CONNECTIONS = 7
-MAX_L2CAP_CHANNELS = 16
-BTA_RFC_MTU_SIZE = (L2CAP_MTU_SIZE-L2CAP_MIN_OFFSET-RFCOMM_DATA_OVERHEAD)
-PORT_TX_BUF_HIGH_WM = 10
-PORT_RX_BUF_HIGH_WM = 10
-PORT_RX_BUF_LOW_WM = 4
-PORT_RX_BUF_CRITICAL_WM = 15
-PORT_TX_BUF_CRITICAL_WM = 15
-PORT_RX_LOW_WM = (BTA_RFC_MTU_SIZE * PORT_RX_BUF_LOW_WM)
-PORT_RX_HIGH_WM = (BTA_RFC_MTU_SIZE * PORT_RX_BUF_HIGH_WM)
-PORT_RX_CRITICAL_WM = (BTA_RFC_MTU_SIZE * PORT_RX_BUF_CRITICAL_WM)
-PORT_TX_HIGH_WM = (BTA_RFC_MTU_SIZE * PORT_TX_BUF_HIGH_WM)
-PORT_TX_CRITICAL_WM = (BTA_RFC_MTU_SIZE * PORT_TX_BUF_CRITICAL_WM)
-BTA_DUN_MTU = BTA_RFC_MTU_SIZE
-BTA_SPP_MTU = BTA_RFC_MTU_SIZE
-BTA_FAX_MTU = BTA_RFC_MTU_SIZE
-SDP_DI_INCLUDED = TRUE
-SDP_RAW_DATA_INCLUDED = TRUE
-SDP_RAW_PDU_INCLUDED = TRUE
-SDP_POOL_ID = 3
-SDP_MAX_REC_ATTR = 25
-SDP_MAX_ATTR_LEN = 400
-SDP_MAX_PAD_LEN = 600
-BNEP_INCLUDED = TRUE
-PAN_INCLUDED = TRUE
-HID_DEV_INCLUDED = FALSE
-HID_HOST_INCLUDED = TRUE
-BLE_INCLUDED = FALSE
-BTM_BLE_CONFORMANCE_TESTING = FALSE
-ATT_INCLUDED = FALSE
-ATT_DEBUG = FALSE
-GATTS_APPU_USE_GATT_TRACE = FALSE
-GATT_CLIENT_ENABLED = FALSE
-GATT_SERVER_ENABLED = FALSE
-SMP_INCLUDED = FALSE
-SMP_HOST_ENCRYPT_INCLUDED = FALSE
-SER_INCLUDED = FALSE
-RPC_INCLUDED = FALSE
-MMI_INCLUDED = FALSE
-SAP_INCLUDED = FALSE
-SBC_NO_PCM_CPY_OPTION = FALSE
-SBC_IPAQ_OPT = FALSE
-SBC_IS_64_MULT_IN_QUANTIZER = FALSE
-BTA_INCLUDED = TRUE
-BTA_AG_INCLUDED = TRUE
-BTA_CT_INCLUDED = FALSE
-BTA_CG_INCLUDED = FALSE
-BTA_DG_INCLUDED = FALSE
-BTA_FT_INCLUDED = FALSE
-BTA_OP_INCLUDED = FALSE
-BTA_PR_INCLUDED = FALSE
-BTA_SS_INCLUDED = FALSE
-BTA_DM_INCLUDED = TRUE
-BTA_DI_INCLUDED = FALSE
-BTA_BI_INCLUDED = FALSE
-BTA_SC_INCLUDED = FALSE
-BTA_PAN_INCLUDED = TRUE
-BTA_FS_INCLUDED = TRUE
-BTA_AC_INCLUDED = FALSE
-BTA_HD_INCLUDED = FALSE
-BTA_HH_INCLUDED = TRUE
-BTA_HH_ROLE = BTA_MASTER_ROLE_PREF
-BTA_AR_INCLUDED = TRUE
-BTA_AV_INCLUDED = TRUE
-BTA_AV_VDP_INCLUDED = FALSE
-BTA_AVK_INCLUDED = FALSE
-BTA_PBS_INCLUDED = FALSE
-BTA_PBC_INCLUDED = FALSE
-BTA_FM_INCLUDED = FALSE
-BTA_FM_DEBUG = FALSE
-BTA_FMTX_INCLUDED = FALSE
-BTA_FMTX_DEBUG = FALSE
-BTA_FMTX_FMRX_SWITCH_WORKAROUND = FALSE
-BTA_FMTX_US_FCC_RULES = FALSE
-BTA_HS_INCLUDED = FALSE
-BTA_MSE_INCLUDED = FALSE
-BTA_MCE_INCLUDED = FALSE
-BTA_PLAYBACK_INCLUDED = FALSE
-BTA_SSR_INCLUDED = FALSE
-BTA_JV_INCLUDED = FALSE
-BTA_EIR_CANNED_UUID_LIST = FALSE
-BTA_GATT_INCLUDED = FALSE
-RSI_INCLUDED = TRUE
-RPC_TRACE_ONLY = FALSE
-ANDROID_APP_INCLUDED = TRUE
-ANDROID_USE_LOGCAT = TRUE
-LINUX_GKI_INCLUDED = TRUE
-TICKS_PER_SEC = 100
-QUICK_TIMER_TICKS_PER_SEC = 10
-BTA_SYS_TIMER_PERIOD = 100
-GKI_BUF1_SIZE = 288
-GKI_BUF3_MAX = 200
-GKI_BUF3_SIZE = (4096+16)
-GKI_BUF4_SIZE = (8080+26)
-GKI_SHUTDOWN_EVT = APPL_EVT_7
-GKI_PTHREAD_JOINABLE = TRUE
-LINUX_DRV_INCLUDED = TRUE
-LINUX_OS = TRUE
-BTU_TASK = 0
-BTIF_TASK = 1
-A2DP_MEDIA_TASK = 2
-GKI_MAX_TASKS = 3
-BTM_APP_DEV_INIT = bte_main_post_reset_init
-BTE_IDLE_TASK_INCLUDED = FALSE
-APPL_INCLUDED = TRUE
-BTU_BTA_INCLUDED = TRUE
-SBC_FOR_EMBEDDED_LINUX = TRUE
-BTA_DM_REMOTE_DEVICE_NAME_LENGTH = 248
-BTM_MAX_REM_BD_NAME_LEN = 248
-BTM_MAX_LOC_BD_NAME_LEN = 248
-BTM_USE_DEF_LOCAL_NAME = TRUE
-BTM_DEF_LOCAL_NAME = "Nexus Q"
-BTM_INQ_DB_SIZE = 40
-BTM_SEC_MAX_DEVICE_RECORDS = 100
-BTM_SEC_FORCE_RNR_FOR_DBOND = FALSE
-BTM_AUTOMATIC_HCI_RESET = FALSE
-AVDT_VERSION = 0x0102
-BTA_AG_AT_MAX_LEN = 512
-BTA_AVRCP_FF_RW_SUPPORT = TRUE
-BTM_MAX_SCO_LINKS = 2
-BTA_AG_SCO_PKT_TYPES = (BTM_SCO_LINK_ONLY_MASK | BTM_SCO_PKT_TYPES_MASK_EV3 |  BTM_SCO_PKT_TYPES_MASK_NO_3_EV3 | BTM_SCO_PKT_TYPES_MASK_NO_2_EV5 | BTM_SCO_PKT_TYPES_MASK_NO_3_EV5)
-BTAPP_AV_SECMASK = (BTA_SEC_AUTHENTICATE | BTA_SEC_AUTHORIZE)
-BTA_AV_MAX_A2DP_MTU = 668
-BTA_AV_RET_TOUT = 15
-PORCHE_PAIRING_CONFLICT = TRUE
-BTA_AV_CO_CP_SCMS_T = FALSE
-AVDT_CONNECT_CP_ONLY = FALSE
-BTL_CFG_USE_CONF_FILE = FALSE
-BTAPP_AHF_API_SUPPORT = TRUE
-HCILP_INCLUDED = TRUE
-HCISU_H4_INCLUDED = TRUE
-BT_TRACE_PROTOCOL = TRUE
-BT_USE_TRACES = TRUE
-BT_TRACE_BTIF = TRUE
-BTTRC_INCLUDED = FALSE
-BT_TRACE_VERBOSE = FALSE
-BTTRC_PARSER_INCLUDED = FALSE
-MAX_TRACE_RAM_SIZE = 10000
-OBX_INITIAL_TRACE_LEVEL = BT_TRACE_LEVEL_ERROR
-BTM_ALLOW_CONN_IF_NONDISCOVER = TRUE
-BTAPP_DM_SUPPORTED_SERVICES = (BTA_HSP_SERVICE_MASK | BTA_HFP_SERVICE_MASK | BTA_A2DP_SERVICE_MASK | BTA_HID_SERVICE_MASK | BTA_OPP_SERVICE_MASK | BTA_BPP_SERVICE_MASK)
-PBAP_ZERO_VCARD_IN_DB = FALSE
-BTA_DM_SDP_DB_SIZE = 8000
-MAX_L2CAP_CLIENTS = 15
-FTS_REJECT_INVALID_OBEX_SET_PATH_REQ = FALSE
-HID_HOST_MAX_CONN_RETRY = (3)
-BTM_DISC_DURING_RS = TRUE
-BTM_WBS_INCLUDED = FALSE
-HL_INCLUDED = TRUE
-NO_GKI_RUN_RETURN = TRUE
-AG_VOICE_SETTINGS = HCI_DEFAULT_VOICE_SETTINGS
-BTIF_DM_OOB_TEST = TRUE
diff --git a/include/bdroid_stingray.txt b/include/bdroid_stingray.txt
deleted file mode 100755
index a11f48d..0000000
--- a/include/bdroid_stingray.txt
+++ /dev/null
@@ -1,176 +0,0 @@
-AVCT_INCLUDED =  TRUE
-AVRC_INCLUDED = TRUE
-AVDT_INCLUDED = TRUE
-UNV_INCLUDED = FALSE
-A2D_INCLUDED = TRUE
-A2D_SBC_INCLUDED = TRUE
-DUN_INCLUDED = FALSE
-GAP_INCLUDED = FALSE
-GOEP_INCLUDED = FALSE
-GOEP_FS_INCLUDED = FALSE
-GATT_PTS = FALSE
-BTM_SEC_MAX_SERVICE_RECORDS = 32
-L2CAP_INCLUDED = TRUE
-L2CAP_LINK_INACTIVITY_TOUT = 4
-L2CAP_FCR_INCLUDED = TRUE
-L2CAP_EXTFEA_SUPPORTED_MASK = (L2CAP_EXTFEA_ENH_RETRANS | L2CAP_EXTFEA_STREAM_MODE | L2CAP_EXTFEA_NO_CRC | L2CAP_EXTFEA_FIXED_CHNLS)
-BTUI_OPS_FORMATS = (BTA_OP_VCARD21_MASK | BTA_OP_VCAL_MASK | BTA_OP_VNOTE_MASK | BTA_OP_ANY_MASK)
-RFCOMM_INCLUDED = TRUE
-MAX_RFC_PORTS = 30
-MAX_ACL_CONNECTIONS = 7
-MAX_L2CAP_CHANNELS = 16
-BTA_RFC_MTU_SIZE = (L2CAP_MTU_SIZE-L2CAP_MIN_OFFSET-RFCOMM_DATA_OVERHEAD)
-PORT_TX_BUF_HIGH_WM = 10
-PORT_RX_BUF_HIGH_WM = 10
-PORT_RX_BUF_LOW_WM = 4
-PORT_RX_BUF_CRITICAL_WM = 15
-PORT_TX_BUF_CRITICAL_WM = 15
-PORT_RX_LOW_WM = (BTA_RFC_MTU_SIZE * PORT_RX_BUF_LOW_WM)
-PORT_RX_HIGH_WM = (BTA_RFC_MTU_SIZE * PORT_RX_BUF_HIGH_WM)
-PORT_RX_CRITICAL_WM = (BTA_RFC_MTU_SIZE * PORT_RX_BUF_CRITICAL_WM)
-PORT_TX_HIGH_WM = (BTA_RFC_MTU_SIZE * PORT_TX_BUF_HIGH_WM)
-PORT_TX_CRITICAL_WM = (BTA_RFC_MTU_SIZE * PORT_TX_BUF_CRITICAL_WM)
-BTA_DUN_MTU = BTA_RFC_MTU_SIZE
-BTA_SPP_MTU = BTA_RFC_MTU_SIZE
-BTA_FAX_MTU = BTA_RFC_MTU_SIZE
-SDP_DI_INCLUDED = TRUE
-SDP_RAW_DATA_INCLUDED = TRUE
-SDP_RAW_PDU_INCLUDED = TRUE
-SDP_POOL_ID = 3
-SDP_MAX_REC_ATTR = 25
-SDP_MAX_ATTR_LEN = 400
-SDP_MAX_PAD_LEN = 600
-BNEP_INCLUDED = TRUE
-PAN_INCLUDED = TRUE
-HID_DEV_INCLUDED = FALSE
-HID_HOST_INCLUDED = FALSE
-BLE_INCLUDED = FALSE
-BTM_BLE_CONFORMANCE_TESTING = FALSE
-ATT_INCLUDED = FALSE
-ATT_DEBUG = FALSE
-GATTS_APPU_USE_GATT_TRACE = FALSE
-GATT_CLIENT_ENABLED = FALSE
-GATT_SERVER_ENABLED = FALSE
-SMP_INCLUDED = FALSE
-SMP_HOST_ENCRYPT_INCLUDED = FALSE
-SER_INCLUDED = FALSE
-RPC_INCLUDED = FALSE
-MMI_INCLUDED = FALSE
-SAP_INCLUDED = FALSE
-SBC_NO_PCM_CPY_OPTION = FALSE
-SBC_IPAQ_OPT = FALSE
-SBC_IS_64_MULT_IN_QUANTIZER = FALSE
-BTA_INCLUDED = TRUE
-BTA_AG_INCLUDED = TRUE
-BTA_CT_INCLUDED = FALSE
-BTA_CG_INCLUDED = FALSE
-BTA_DG_INCLUDED = FALSE
-BTA_FT_INCLUDED = FALSE
-BTA_OP_INCLUDED = FALSE
-BTA_PR_INCLUDED = FALSE
-BTA_SS_INCLUDED = FALSE
-BTA_DM_INCLUDED = TRUE
-BTA_DI_INCLUDED = FALSE
-BTA_BI_INCLUDED = FALSE
-BTA_SC_INCLUDED = FALSE
-BTA_PAN_INCLUDED = TRUE
-PAN_NAP_DISABLED = TRUE
-BTA_FS_INCLUDED = TRUE
-BTA_AC_INCLUDED = FALSE
-BTA_HD_INCLUDED = FALSE
-BTA_HH_INCLUDED = TRUE
-BTA_HH_ROLE = BTA_MASTER_ROLE_PREF
-BTA_AR_INCLUDED = TRUE
-BTA_AV_INCLUDED = TRUE
-BTA_AV_VDP_INCLUDED = FALSE
-BTA_AVK_INCLUDED = FALSE
-BTA_PBS_INCLUDED = FALSE
-BTA_PBC_INCLUDED = FALSE
-BTA_FM_INCLUDED = FALSE
-BTA_FM_DEBUG = FALSE
-BTA_FMTX_INCLUDED = FALSE
-BTA_FMTX_DEBUG = FALSE
-BTA_FMTX_FMRX_SWITCH_WORKAROUND = FALSE
-BTA_FMTX_US_FCC_RULES = FALSE
-BTA_HS_INCLUDED = FALSE
-BTA_MSE_INCLUDED = FALSE
-BTA_MCE_INCLUDED = FALSE
-BTA_PLAYBACK_INCLUDED = FALSE
-BTA_SSR_INCLUDED = FALSE
-BTA_JV_INCLUDED = FALSE
-BTA_EIR_CANNED_UUID_LIST = FALSE
-BTA_GATT_INCLUDED = FALSE
-RSI_INCLUDED = TRUE
-RPC_TRACE_ONLY = FALSE
-ANDROID_APP_INCLUDED = TRUE
-ANDROID_USE_LOGCAT = TRUE
-LINUX_GKI_INCLUDED = TRUE
-TICKS_PER_SEC = 100
-QUICK_TIMER_TICKS_PER_SEC = 10
-BTA_SYS_TIMER_PERIOD = 100
-GKI_BUF1_SIZE = 288
-GKI_BUF3_MAX = 100
-GKI_BUF3_SIZE = (4096+16)
-GKI_BUF4_SIZE = (8080+26)
-GKI_SHUTDOWN_EVT = APPL_EVT_7
-GKI_PTHREAD_JOINABLE = TRUE
-LINUX_DRV_INCLUDED = TRUE
-LINUX_OS = TRUE
-BTU_TASK = 0
-BTIF_TASK = 1
-A2DP_MEDIA_TASK = 2
-GKI_MAX_TASKS = 3
-BTM_APP_DEV_INIT = bte_main_post_reset_init
-BTE_IDLE_TASK_INCLUDED = FALSE
-APPL_INCLUDED = TRUE
-BTU_BTA_INCLUDED = TRUE
-SBC_FOR_EMBEDDED_LINUX = TRUE
-BTA_DM_REMOTE_DEVICE_NAME_LENGTH = 248
-BTM_MAX_REM_BD_NAME_LEN = 248
-BTM_MAX_LOC_BD_NAME_LEN = 248
-BTM_USE_DEF_LOCAL_NAME = TRUE
-BTM_DEF_LOCAL_NAME = "Xoom 2"
-BTM_INQ_DB_SIZE = 40
-BTM_SEC_MAX_DEVICE_RECORDS = 100
-BTM_SEC_FORCE_RNR_FOR_DBOND = FALSE
-BTM_AUTOMATIC_HCI_RESET = FALSE
-AVDT_VERSION = 0x0102
-BTA_AG_AT_MAX_LEN = 512
-BTA_AVRCP_FF_RW_SUPPORT = TRUE
-BTM_MAX_SCO_LINKS = 2
-BTA_AG_SCO_PKT_TYPES = (BTM_SCO_LINK_ONLY_MASK | BTM_SCO_PKT_TYPES_MASK_EV3 |  BTM_SCO_PKT_TYPES_MASK_NO_3_EV3 | BTM_SCO_PKT_TYPES_MASK_NO_2_EV5 | BTM_SCO_PKT_TYPES_MASK_NO_3_EV5)
-BTAPP_AV_SECMASK = (BTA_SEC_AUTHENTICATE | BTA_SEC_AUTHORIZE)
-BTA_AV_MAX_A2DP_MTU = 668
-BTA_AV_RET_TOUT = 15
-PORCHE_PAIRING_CONFLICT = TRUE
-BTA_AV_CO_CP_SCMS_T = FALSE
-AVDT_CONNECT_CP_ONLY = FALSE
-BTL_CFG_USE_CONF_FILE = FALSE
-BTAPP_AHF_API_SUPPORT = TRUE
-HCILP_INCLUDED = TRUE
-HCISU_H4_INCLUDED = TRUE
-BT_TRACE_PROTOCOL = TRUE
-BT_USE_TRACES = TRUE
-BT_TRACE_BTIF = TRUE
-BTTRC_INCLUDED = FALSE
-BT_TRACE_VERBOSE = FALSE
-BTTRC_PARSER_INCLUDED = FALSE
-MAX_TRACE_RAM_SIZE = 10000
-OBX_INITIAL_TRACE_LEVEL = BT_TRACE_LEVEL_ERROR
-BTM_ALLOW_CONN_IF_NONDISCOVER = TRUE
-BTAPP_DM_SUPPORTED_SERVICES = (BTA_HSP_SERVICE_MASK | BTA_HFP_SERVICE_MASK | BTA_A2DP_SERVICE_MASK | BTA_HID_SERVICE_MASK | BTA_OPP_SERVICE_MASK | BTA_BPP_SERVICE_MASK)
-PBAP_ZERO_VCARD_IN_DB = FALSE
-BTA_DM_SDP_DB_SIZE = 8000
-MAX_L2CAP_CLIENTS = 15
-FTS_REJECT_INVALID_OBEX_SET_PATH_REQ = FALSE
-HID_HOST_MAX_CONN_RETRY = (3)
-BTM_DISC_DURING_RS = TRUE
-BTM_WBS_INCLUDED = FALSE
-HL_INCLUDED = TRUE
-NO_GKI_RUN_RETURN = TRUE
-AG_VOICE_SETTINGS = HCI_DEFAULT_VOICE_SETTINGS
-BTIF_DM_OOB_TEST = TRUE
-BTIF_HSAG_SERVICE_NAME = ("Headset Gateway")
-BTIF_HFAG_SERVICE_NAME = ("Handsfree Gateway")
-BTIF_HF_SERVICES = (BTA_HSP_SERVICE_MASK)
-BTIF_HF_SERVICE_NAMES = { BTIF_HSAG_SERVICE_NAME }
diff --git a/include/bdroid_toro.txt b/include/bdroid_toro.txt
deleted file mode 100755
index 2a39aa6..0000000
--- a/include/bdroid_toro.txt
+++ /dev/null
@@ -1,170 +0,0 @@
-AVCT_INCLUDED =  TRUE
-AVRC_INCLUDED = TRUE
-AVDT_INCLUDED = TRUE
-UNV_INCLUDED = FALSE
-A2D_INCLUDED = TRUE
-A2D_SBC_INCLUDED = TRUE
-DUN_INCLUDED = FALSE
-GAP_INCLUDED = FALSE
-GOEP_INCLUDED = FALSE
-GOEP_FS_INCLUDED = FALSE
-GATT_PTS = FALSE
-BTM_SEC_MAX_SERVICE_RECORDS = 32
-L2CAP_INCLUDED = TRUE
-L2CAP_LINK_INACTIVITY_TOUT = 4
-L2CAP_FCR_INCLUDED = TRUE
-L2CAP_EXTFEA_SUPPORTED_MASK = (L2CAP_EXTFEA_ENH_RETRANS | L2CAP_EXTFEA_STREAM_MODE | L2CAP_EXTFEA_NO_CRC | L2CAP_EXTFEA_FIXED_CHNLS)
-BTUI_OPS_FORMATS = (BTA_OP_VCARD21_MASK | BTA_OP_VCAL_MASK | BTA_OP_VNOTE_MASK | BTA_OP_ANY_MASK)
-RFCOMM_INCLUDED = TRUE
-MAX_RFC_PORTS = 30
-MAX_ACL_CONNECTIONS = 7
-MAX_L2CAP_CHANNELS = 16
-BTA_RFC_MTU_SIZE = (L2CAP_MTU_SIZE-L2CAP_MIN_OFFSET-RFCOMM_DATA_OVERHEAD)
-PORT_TX_BUF_HIGH_WM = 10
-PORT_RX_BUF_HIGH_WM = 10
-PORT_RX_BUF_LOW_WM = 4
-PORT_RX_BUF_CRITICAL_WM = 15
-PORT_TX_BUF_CRITICAL_WM = 15
-PORT_RX_LOW_WM = (BTA_RFC_MTU_SIZE * PORT_RX_BUF_LOW_WM)
-PORT_RX_HIGH_WM = (BTA_RFC_MTU_SIZE * PORT_RX_BUF_HIGH_WM)
-PORT_RX_CRITICAL_WM = (BTA_RFC_MTU_SIZE * PORT_RX_BUF_CRITICAL_WM)
-PORT_TX_HIGH_WM = (BTA_RFC_MTU_SIZE * PORT_TX_BUF_HIGH_WM)
-PORT_TX_CRITICAL_WM = (BTA_RFC_MTU_SIZE * PORT_TX_BUF_CRITICAL_WM)
-BTA_DUN_MTU = BTA_RFC_MTU_SIZE
-BTA_SPP_MTU = BTA_RFC_MTU_SIZE
-BTA_FAX_MTU = BTA_RFC_MTU_SIZE
-SDP_DI_INCLUDED = TRUE
-SDP_RAW_DATA_INCLUDED = TRUE
-SDP_RAW_PDU_INCLUDED = TRUE
-SDP_POOL_ID = 3
-SDP_MAX_REC_ATTR = 25
-SDP_MAX_ATTR_LEN = 400
-SDP_MAX_PAD_LEN = 600
-BNEP_INCLUDED = TRUE
-PAN_INCLUDED = TRUE
-HID_DEV_INCLUDED = FALSE
-HID_HOST_INCLUDED = TRUE
-BLE_INCLUDED = FALSE
-BTM_BLE_CONFORMANCE_TESTING = FALSE
-ATT_INCLUDED = FALSE
-ATT_DEBUG = FALSE
-GATTS_APPU_USE_GATT_TRACE = FALSE
-GATT_CLIENT_ENABLED = FALSE
-GATT_SERVER_ENABLED = FALSE
-SMP_INCLUDED = FALSE
-SMP_HOST_ENCRYPT_INCLUDED = FALSE
-SER_INCLUDED = FALSE
-RPC_INCLUDED = FALSE
-MMI_INCLUDED = FALSE
-SAP_INCLUDED = FALSE
-SBC_NO_PCM_CPY_OPTION = FALSE
-SBC_IPAQ_OPT = FALSE
-SBC_IS_64_MULT_IN_QUANTIZER = FALSE
-BTA_INCLUDED = TRUE
-BTA_AG_INCLUDED = TRUE
-BTA_CT_INCLUDED = FALSE
-BTA_CG_INCLUDED = FALSE
-BTA_DG_INCLUDED = FALSE
-BTA_FT_INCLUDED = FALSE
-BTA_OP_INCLUDED = FALSE
-BTA_PR_INCLUDED = FALSE
-BTA_SS_INCLUDED = FALSE
-BTA_DM_INCLUDED = TRUE
-BTA_DI_INCLUDED = FALSE
-BTA_BI_INCLUDED = FALSE
-BTA_SC_INCLUDED = FALSE
-BTA_PAN_INCLUDED = TRUE
-BTA_FS_INCLUDED = TRUE
-BTA_AC_INCLUDED = FALSE
-BTA_HD_INCLUDED = FALSE
-BTA_HH_INCLUDED = TRUE
-BTA_HH_ROLE = BTA_MASTER_ROLE_PREF
-BTA_AR_INCLUDED = TRUE
-BTA_AV_INCLUDED = TRUE
-BTA_AV_VDP_INCLUDED = FALSE
-BTA_AVK_INCLUDED = FALSE
-BTA_PBS_INCLUDED = FALSE
-BTA_PBC_INCLUDED = FALSE
-BTA_FM_INCLUDED = FALSE
-BTA_FM_DEBUG = FALSE
-BTA_FMTX_INCLUDED = FALSE
-BTA_FMTX_DEBUG = FALSE
-BTA_FMTX_FMRX_SWITCH_WORKAROUND = FALSE
-BTA_FMTX_US_FCC_RULES = FALSE
-BTA_HS_INCLUDED = FALSE
-BTA_MSE_INCLUDED = FALSE
-BTA_MCE_INCLUDED = FALSE
-BTA_PLAYBACK_INCLUDED = FALSE
-BTA_SSR_INCLUDED = FALSE
-BTA_JV_INCLUDED = FALSE
-BTA_EIR_CANNED_UUID_LIST = FALSE
-BTA_GATT_INCLUDED = FALSE
-RSI_INCLUDED = TRUE
-RPC_TRACE_ONLY = FALSE
-ANDROID_APP_INCLUDED = TRUE
-ANDROID_USE_LOGCAT = TRUE
-LINUX_GKI_INCLUDED = TRUE
-TICKS_PER_SEC = 100
-QUICK_TIMER_TICKS_PER_SEC = 10
-BTA_SYS_TIMER_PERIOD = 100
-GKI_BUF1_SIZE = 288
-GKI_BUF3_MAX = 200
-GKI_BUF3_SIZE = (4096+16)
-GKI_BUF4_SIZE = (8080+26)
-GKI_SHUTDOWN_EVT = APPL_EVT_7
-GKI_PTHREAD_JOINABLE = TRUE
-LINUX_DRV_INCLUDED = TRUE
-LINUX_OS = TRUE
-BTU_TASK = 0
-BTIF_TASK = 1
-A2DP_MEDIA_TASK = 2
-GKI_MAX_TASKS = 3
-BTM_APP_DEV_INIT = bte_main_post_reset_init
-BTE_IDLE_TASK_INCLUDED = FALSE
-APPL_INCLUDED = TRUE
-BTU_BTA_INCLUDED = TRUE
-SBC_FOR_EMBEDDED_LINUX = TRUE
-BTA_DM_REMOTE_DEVICE_NAME_LENGTH = 248
-BTM_MAX_REM_BD_NAME_LEN = 248
-BTM_MAX_LOC_BD_NAME_LEN = 248
-BTM_USE_DEF_LOCAL_NAME = TRUE
-BTM_DEF_LOCAL_NAME = "Galaxy Nexus CDMA 2"
-BTM_INQ_DB_SIZE = 40
-BTM_SEC_MAX_DEVICE_RECORDS = 100
-BTM_SEC_FORCE_RNR_FOR_DBOND = FALSE
-BTM_AUTOMATIC_HCI_RESET = FALSE
-AVDT_VERSION = 0x0102
-BTA_AG_AT_MAX_LEN = 512
-BTA_AVRCP_FF_RW_SUPPORT = TRUE
-BTM_MAX_SCO_LINKS = 2
-BTA_AG_SCO_PKT_TYPES = (BTM_SCO_LINK_ONLY_MASK | BTM_SCO_PKT_TYPES_MASK_EV3 |  BTM_SCO_PKT_TYPES_MASK_NO_3_EV3 | BTM_SCO_PKT_TYPES_MASK_NO_2_EV5 | BTM_SCO_PKT_TYPES_MASK_NO_3_EV5)
-BTAPP_AV_SECMASK = (BTA_SEC_AUTHENTICATE | BTA_SEC_AUTHORIZE)
-BTA_AV_MAX_A2DP_MTU = 668
-PORCHE_PAIRING_CONFLICT = TRUE
-BTA_AV_CO_CP_SCMS_T = FALSE
-AVDT_CONNECT_CP_ONLY = FALSE
-BTL_CFG_USE_CONF_FILE = FALSE
-BTAPP_AHF_API_SUPPORT = TRUE
-HCILP_INCLUDED = TRUE
-HCISU_H4_INCLUDED = TRUE
-BT_TRACE_PROTOCOL = TRUE
-BT_USE_TRACES = TRUE
-BT_TRACE_BTIF = TRUE
-BTTRC_INCLUDED = FALSE
-BT_TRACE_VERBOSE = FALSE
-BTTRC_PARSER_INCLUDED = FALSE
-MAX_TRACE_RAM_SIZE = 10000
-OBX_INITIAL_TRACE_LEVEL = BT_TRACE_LEVEL_ERROR
-BTM_ALLOW_CONN_IF_NONDISCOVER = TRUE
-BTAPP_DM_SUPPORTED_SERVICES = (BTA_HSP_SERVICE_MASK | BTA_HFP_SERVICE_MASK | BTA_A2DP_SERVICE_MASK | BTA_HID_SERVICE_MASK | BTA_OPP_SERVICE_MASK | BTA_BPP_SERVICE_MASK)
-PBAP_ZERO_VCARD_IN_DB = FALSE
-BTA_DM_SDP_DB_SIZE = 8000
-MAX_L2CAP_CLIENTS = 15
-FTS_REJECT_INVALID_OBEX_SET_PATH_REQ = FALSE
-HID_HOST_MAX_CONN_RETRY = (3)
-BTM_DISC_DURING_RS = TRUE
-BTM_WBS_INCLUDED = FALSE
-HL_INCLUDED = TRUE
-NO_GKI_RUN_RETURN = TRUE
-AG_VOICE_SETTINGS = HCI_DEFAULT_VOICE_SETTINGS
-BTIF_DM_OOB_TEST = TRUE
diff --git a/include/bdroid_tuna.txt b/include/bdroid_tuna.txt
deleted file mode 100755
index 204b09f..0000000
--- a/include/bdroid_tuna.txt
+++ /dev/null
@@ -1,171 +0,0 @@
-AVCT_INCLUDED =  TRUE
-AVRC_INCLUDED = TRUE
-AVDT_INCLUDED = TRUE
-UNV_INCLUDED = FALSE
-A2D_INCLUDED = TRUE
-A2D_SBC_INCLUDED = TRUE
-DUN_INCLUDED = FALSE
-GAP_INCLUDED = FALSE
-GOEP_INCLUDED = FALSE
-GOEP_FS_INCLUDED = FALSE
-GATT_PTS = FALSE
-BTM_SEC_MAX_SERVICE_RECORDS = 32
-L2CAP_INCLUDED = TRUE
-L2CAP_LINK_INACTIVITY_TOUT = 4
-L2CAP_FCR_INCLUDED = TRUE
-L2CAP_EXTFEA_SUPPORTED_MASK = (L2CAP_EXTFEA_ENH_RETRANS | L2CAP_EXTFEA_STREAM_MODE | L2CAP_EXTFEA_NO_CRC | L2CAP_EXTFEA_FIXED_CHNLS)
-BTUI_OPS_FORMATS = (BTA_OP_VCARD21_MASK | BTA_OP_VCAL_MASK | BTA_OP_VNOTE_MASK | BTA_OP_ANY_MASK)
-RFCOMM_INCLUDED = TRUE
-MAX_RFC_PORTS = 30
-MAX_ACL_CONNECTIONS = 7
-MAX_L2CAP_CHANNELS = 16
-BTA_RFC_MTU_SIZE = (L2CAP_MTU_SIZE-L2CAP_MIN_OFFSET-RFCOMM_DATA_OVERHEAD)
-PORT_TX_BUF_HIGH_WM = 10
-PORT_RX_BUF_HIGH_WM = 10
-PORT_RX_BUF_LOW_WM = 4
-PORT_RX_BUF_CRITICAL_WM = 15
-PORT_TX_BUF_CRITICAL_WM = 15
-PORT_RX_LOW_WM = (BTA_RFC_MTU_SIZE * PORT_RX_BUF_LOW_WM)
-PORT_RX_HIGH_WM = (BTA_RFC_MTU_SIZE * PORT_RX_BUF_HIGH_WM)
-PORT_RX_CRITICAL_WM = (BTA_RFC_MTU_SIZE * PORT_RX_BUF_CRITICAL_WM)
-PORT_TX_HIGH_WM = (BTA_RFC_MTU_SIZE * PORT_TX_BUF_HIGH_WM)
-PORT_TX_CRITICAL_WM = (BTA_RFC_MTU_SIZE * PORT_TX_BUF_CRITICAL_WM)
-BTA_DUN_MTU = BTA_RFC_MTU_SIZE
-BTA_SPP_MTU = BTA_RFC_MTU_SIZE
-BTA_FAX_MTU = BTA_RFC_MTU_SIZE
-SDP_DI_INCLUDED = TRUE
-SDP_RAW_DATA_INCLUDED = TRUE
-SDP_RAW_PDU_INCLUDED = TRUE
-SDP_POOL_ID = 3
-SDP_MAX_REC_ATTR = 25
-SDP_MAX_ATTR_LEN = 400
-SDP_MAX_PAD_LEN = 600
-BNEP_INCLUDED = TRUE
-PAN_INCLUDED = TRUE
-HID_DEV_INCLUDED = FALSE
-HID_HOST_INCLUDED = TRUE
-BLE_INCLUDED = FALSE
-BTM_BLE_CONFORMANCE_TESTING = FALSE
-ATT_INCLUDED = FALSE
-ATT_DEBUG = FALSE
-GATTS_APPU_USE_GATT_TRACE = FALSE
-GATT_CLIENT_ENABLED = FALSE
-GATT_SERVER_ENABLED = FALSE
-SMP_INCLUDED = FALSE
-SMP_HOST_ENCRYPT_INCLUDED = FALSE
-SER_INCLUDED = FALSE
-RPC_INCLUDED = FALSE
-MMI_INCLUDED = FALSE
-SAP_INCLUDED = FALSE
-SBC_NO_PCM_CPY_OPTION = FALSE
-SBC_IPAQ_OPT = FALSE
-SBC_IS_64_MULT_IN_QUANTIZER = FALSE
-BTA_INCLUDED = TRUE
-BTA_AG_INCLUDED = TRUE
-BTA_CT_INCLUDED = FALSE
-BTA_CG_INCLUDED = FALSE
-BTA_DG_INCLUDED = FALSE
-BTA_FT_INCLUDED = FALSE
-BTA_OP_INCLUDED = FALSE
-BTA_PR_INCLUDED = FALSE
-BTA_SS_INCLUDED = FALSE
-BTA_DM_INCLUDED = TRUE
-BTA_DI_INCLUDED = FALSE
-BTA_BI_INCLUDED = FALSE
-BTA_SC_INCLUDED = FALSE
-BTA_PAN_INCLUDED = TRUE
-BTA_FS_INCLUDED = TRUE
-BTA_AC_INCLUDED = FALSE
-BTA_HD_INCLUDED = FALSE
-BTA_HH_INCLUDED = TRUE
-BTA_HH_ROLE = BTA_MASTER_ROLE_PREF
-BTA_AR_INCLUDED = TRUE
-BTA_AV_INCLUDED = TRUE
-BTA_AV_VDP_INCLUDED = FALSE
-BTA_AVK_INCLUDED = FALSE
-BTA_PBS_INCLUDED = FALSE
-BTA_PBC_INCLUDED = FALSE
-BTA_FM_INCLUDED = FALSE
-BTA_FM_DEBUG = FALSE
-BTA_FMTX_INCLUDED = FALSE
-BTA_FMTX_DEBUG = FALSE
-BTA_FMTX_FMRX_SWITCH_WORKAROUND = FALSE
-BTA_FMTX_US_FCC_RULES = FALSE
-BTA_HS_INCLUDED = FALSE
-BTA_MSE_INCLUDED = FALSE
-BTA_MCE_INCLUDED = FALSE
-BTA_PLAYBACK_INCLUDED = FALSE
-BTA_SSR_INCLUDED = FALSE
-BTA_JV_INCLUDED = FALSE
-BTA_EIR_CANNED_UUID_LIST = FALSE
-BTA_GATT_INCLUDED = FALSE
-RSI_INCLUDED = TRUE
-RPC_TRACE_ONLY = FALSE
-ANDROID_APP_INCLUDED = TRUE
-ANDROID_USE_LOGCAT = TRUE
-LINUX_GKI_INCLUDED = TRUE
-TICKS_PER_SEC = 100
-QUICK_TIMER_TICKS_PER_SEC = 10
-BTA_SYS_TIMER_PERIOD = 100
-GKI_BUF1_SIZE = 288
-GKI_BUF3_MAX = 200
-GKI_BUF3_SIZE = (4096+16)
-GKI_BUF4_SIZE = (8080+26)
-GKI_SHUTDOWN_EVT = APPL_EVT_7
-GKI_PTHREAD_JOINABLE = TRUE
-LINUX_DRV_INCLUDED = TRUE
-LINUX_OS = TRUE
-BTU_TASK = 0
-BTIF_TASK = 1
-A2DP_MEDIA_TASK = 2
-GKI_MAX_TASKS = 3
-BTM_APP_DEV_INIT = bte_main_post_reset_init
-BTE_IDLE_TASK_INCLUDED = FALSE
-APPL_INCLUDED = TRUE
-BTU_BTA_INCLUDED = TRUE
-SBC_FOR_EMBEDDED_LINUX = TRUE
-BTA_DM_REMOTE_DEVICE_NAME_LENGTH = 248
-BTM_MAX_REM_BD_NAME_LEN = 248
-BTM_MAX_LOC_BD_NAME_LEN = 248
-BTM_USE_DEF_LOCAL_NAME = TRUE
-BTM_DEF_LOCAL_NAME = "Galaxy Nexus 2"
-BTM_INQ_DB_SIZE = 40
-BTM_SEC_MAX_DEVICE_RECORDS = 100
-BTM_SEC_FORCE_RNR_FOR_DBOND = FALSE
-BTM_AUTOMATIC_HCI_RESET = FALSE
-AVDT_VERSION = 0x0102
-BTA_AG_AT_MAX_LEN = 512
-BTA_AVRCP_FF_RW_SUPPORT = TRUE
-BTM_MAX_SCO_LINKS = 2
-BTA_AG_SCO_PKT_TYPES = (BTM_SCO_LINK_ONLY_MASK | BTM_SCO_PKT_TYPES_MASK_EV3 |  BTM_SCO_PKT_TYPES_MASK_NO_3_EV3 | BTM_SCO_PKT_TYPES_MASK_NO_2_EV5 | BTM_SCO_PKT_TYPES_MASK_NO_3_EV5)
-BTAPP_AV_SECMASK = (BTA_SEC_AUTHENTICATE | BTA_SEC_AUTHORIZE)
-BTA_AV_MAX_A2DP_MTU = 668
-BTA_AV_RET_TOUT = 15
-PORCHE_PAIRING_CONFLICT = TRUE
-BTA_AV_CO_CP_SCMS_T = FALSE
-AVDT_CONNECT_CP_ONLY = FALSE
-BTL_CFG_USE_CONF_FILE = FALSE
-BTAPP_AHF_API_SUPPORT = TRUE
-HCILP_INCLUDED = TRUE
-HCISU_H4_INCLUDED = TRUE
-BT_TRACE_PROTOCOL = TRUE
-BT_USE_TRACES = TRUE
-BT_TRACE_BTIF = TRUE
-BTTRC_INCLUDED = FALSE
-BT_TRACE_VERBOSE = FALSE
-BTTRC_PARSER_INCLUDED = FALSE
-MAX_TRACE_RAM_SIZE = 10000
-OBX_INITIAL_TRACE_LEVEL = BT_TRACE_LEVEL_ERROR
-BTM_ALLOW_CONN_IF_NONDISCOVER = TRUE
-BTAPP_DM_SUPPORTED_SERVICES = (BTA_HSP_SERVICE_MASK | BTA_HFP_SERVICE_MASK | BTA_A2DP_SERVICE_MASK | BTA_HID_SERVICE_MASK | BTA_OPP_SERVICE_MASK | BTA_BPP_SERVICE_MASK)
-PBAP_ZERO_VCARD_IN_DB = FALSE
-BTA_DM_SDP_DB_SIZE = 8000
-MAX_L2CAP_CLIENTS = 15
-FTS_REJECT_INVALID_OBEX_SET_PATH_REQ = FALSE
-HID_HOST_MAX_CONN_RETRY = (3)
-BTM_DISC_DURING_RS = TRUE
-BTM_WBS_INCLUDED = FALSE
-HL_INCLUDED = TRUE
-NO_GKI_RUN_RETURN = TRUE
-AG_VOICE_SETTINGS = HCI_DEFAULT_VOICE_SETTINGS
-BTIF_DM_OOB_TEST = TRUE
diff --git a/include/bdroid_wingray.txt b/include/bdroid_wingray.txt
deleted file mode 100755
index 3e63f69..0000000
--- a/include/bdroid_wingray.txt
+++ /dev/null
@@ -1,176 +0,0 @@
-AVCT_INCLUDED =  TRUE
-AVRC_INCLUDED = TRUE
-AVDT_INCLUDED = TRUE
-UNV_INCLUDED = FALSE
-A2D_INCLUDED = TRUE
-A2D_SBC_INCLUDED = TRUE
-DUN_INCLUDED = FALSE
-GAP_INCLUDED = FALSE
-GOEP_INCLUDED = FALSE
-GOEP_FS_INCLUDED = FALSE
-GATT_PTS = FALSE
-BTM_SEC_MAX_SERVICE_RECORDS = 32
-L2CAP_INCLUDED = TRUE
-L2CAP_LINK_INACTIVITY_TOUT = 4
-L2CAP_FCR_INCLUDED = TRUE
-L2CAP_EXTFEA_SUPPORTED_MASK = (L2CAP_EXTFEA_ENH_RETRANS | L2CAP_EXTFEA_STREAM_MODE | L2CAP_EXTFEA_NO_CRC | L2CAP_EXTFEA_FIXED_CHNLS)
-BTUI_OPS_FORMATS = (BTA_OP_VCARD21_MASK | BTA_OP_VCAL_MASK | BTA_OP_VNOTE_MASK | BTA_OP_ANY_MASK)
-RFCOMM_INCLUDED = TRUE
-MAX_RFC_PORTS = 30
-MAX_ACL_CONNECTIONS = 7
-MAX_L2CAP_CHANNELS = 16
-BTA_RFC_MTU_SIZE = (L2CAP_MTU_SIZE-L2CAP_MIN_OFFSET-RFCOMM_DATA_OVERHEAD)
-PORT_TX_BUF_HIGH_WM = 10
-PORT_RX_BUF_HIGH_WM = 10
-PORT_RX_BUF_LOW_WM = 4
-PORT_RX_BUF_CRITICAL_WM = 15
-PORT_TX_BUF_CRITICAL_WM = 15
-PORT_RX_LOW_WM = (BTA_RFC_MTU_SIZE * PORT_RX_BUF_LOW_WM)
-PORT_RX_HIGH_WM = (BTA_RFC_MTU_SIZE * PORT_RX_BUF_HIGH_WM)
-PORT_RX_CRITICAL_WM = (BTA_RFC_MTU_SIZE * PORT_RX_BUF_CRITICAL_WM)
-PORT_TX_HIGH_WM = (BTA_RFC_MTU_SIZE * PORT_TX_BUF_HIGH_WM)
-PORT_TX_CRITICAL_WM = (BTA_RFC_MTU_SIZE * PORT_TX_BUF_CRITICAL_WM)
-BTA_DUN_MTU = BTA_RFC_MTU_SIZE
-BTA_SPP_MTU = BTA_RFC_MTU_SIZE
-BTA_FAX_MTU = BTA_RFC_MTU_SIZE
-SDP_DI_INCLUDED = TRUE
-SDP_RAW_DATA_INCLUDED = TRUE
-SDP_RAW_PDU_INCLUDED = TRUE
-SDP_POOL_ID = 3
-SDP_MAX_REC_ATTR = 25
-SDP_MAX_ATTR_LEN = 400
-SDP_MAX_PAD_LEN = 600
-BNEP_INCLUDED = TRUE
-PAN_INCLUDED = TRUE
-HID_DEV_INCLUDED = FALSE
-HID_HOST_INCLUDED = FALSE
-BLE_INCLUDED = FALSE
-BTM_BLE_CONFORMANCE_TESTING = FALSE
-ATT_INCLUDED = FALSE
-ATT_DEBUG = FALSE
-GATTS_APPU_USE_GATT_TRACE = FALSE
-GATT_CLIENT_ENABLED = FALSE
-GATT_SERVER_ENABLED = FALSE
-SMP_INCLUDED = FALSE
-SMP_HOST_ENCRYPT_INCLUDED = FALSE
-SER_INCLUDED = FALSE
-RPC_INCLUDED = FALSE
-MMI_INCLUDED = FALSE
-SAP_INCLUDED = FALSE
-SBC_NO_PCM_CPY_OPTION = FALSE
-SBC_IPAQ_OPT = FALSE
-SBC_IS_64_MULT_IN_QUANTIZER = FALSE
-BTA_INCLUDED = TRUE
-BTA_AG_INCLUDED = TRUE
-BTA_CT_INCLUDED = FALSE
-BTA_CG_INCLUDED = FALSE
-BTA_DG_INCLUDED = FALSE
-BTA_FT_INCLUDED = FALSE
-BTA_OP_INCLUDED = FALSE
-BTA_PR_INCLUDED = FALSE
-BTA_SS_INCLUDED = FALSE
-BTA_DM_INCLUDED = TRUE
-BTA_DI_INCLUDED = FALSE
-BTA_BI_INCLUDED = FALSE
-BTA_SC_INCLUDED = FALSE
-BTA_PAN_INCLUDED = TRUE
-PAN_NAP_DISABLED = TRUE
-BTA_FS_INCLUDED = TRUE
-BTA_AC_INCLUDED = FALSE
-BTA_HD_INCLUDED = FALSE
-BTA_HH_INCLUDED = TRUE
-BTA_HH_ROLE = BTA_MASTER_ROLE_PREF
-BTA_AR_INCLUDED = TRUE
-BTA_AV_INCLUDED = TRUE
-BTA_AV_VDP_INCLUDED = FALSE
-BTA_AVK_INCLUDED = FALSE
-BTA_PBS_INCLUDED = FALSE
-BTA_PBC_INCLUDED = FALSE
-BTA_FM_INCLUDED = FALSE
-BTA_FM_DEBUG = FALSE
-BTA_FMTX_INCLUDED = FALSE
-BTA_FMTX_DEBUG = FALSE
-BTA_FMTX_FMRX_SWITCH_WORKAROUND = FALSE
-BTA_FMTX_US_FCC_RULES = FALSE
-BTA_HS_INCLUDED = FALSE
-BTA_MSE_INCLUDED = FALSE
-BTA_MCE_INCLUDED = FALSE
-BTA_PLAYBACK_INCLUDED = FALSE
-BTA_SSR_INCLUDED = FALSE
-BTA_JV_INCLUDED = FALSE
-BTA_EIR_CANNED_UUID_LIST = FALSE
-BTA_GATT_INCLUDED = FALSE
-RSI_INCLUDED = TRUE
-RPC_TRACE_ONLY = FALSE
-ANDROID_APP_INCLUDED = TRUE
-ANDROID_USE_LOGCAT = TRUE
-LINUX_GKI_INCLUDED = TRUE
-TICKS_PER_SEC = 100
-QUICK_TIMER_TICKS_PER_SEC = 10
-BTA_SYS_TIMER_PERIOD = 100
-GKI_BUF1_SIZE = 288
-GKI_BUF3_MAX = 100
-GKI_BUF3_SIZE = (4096+16)
-GKI_BUF4_SIZE = (8080+26)
-GKI_SHUTDOWN_EVT = APPL_EVT_7
-GKI_PTHREAD_JOINABLE = TRUE
-LINUX_DRV_INCLUDED = TRUE
-LINUX_OS = TRUE
-BTU_TASK = 0
-BTIF_TASK = 1
-A2DP_MEDIA_TASK = 2
-GKI_MAX_TASKS = 3
-BTM_APP_DEV_INIT = bte_main_post_reset_init
-BTE_IDLE_TASK_INCLUDED = FALSE
-APPL_INCLUDED = TRUE
-BTU_BTA_INCLUDED = TRUE
-SBC_FOR_EMBEDDED_LINUX = TRUE
-BTA_DM_REMOTE_DEVICE_NAME_LENGTH = 248
-BTM_MAX_REM_BD_NAME_LEN = 248
-BTM_MAX_LOC_BD_NAME_LEN = 248
-BTM_USE_DEF_LOCAL_NAME = TRUE
-BTM_DEF_LOCAL_NAME = "Xoom 2"
-BTM_INQ_DB_SIZE = 40
-BTM_SEC_MAX_DEVICE_RECORDS = 100
-BTM_SEC_FORCE_RNR_FOR_DBOND = FALSE
-BTM_AUTOMATIC_HCI_RESET = FALSE
-AVDT_VERSION = 0x0102
-BTA_AG_AT_MAX_LEN = 512
-BTA_AVRCP_FF_RW_SUPPORT = TRUE
-BTM_MAX_SCO_LINKS = 2
-BTA_AG_SCO_PKT_TYPES = (BTM_SCO_LINK_ONLY_MASK | BTM_SCO_PKT_TYPES_MASK_EV3 |  BTM_SCO_PKT_TYPES_MASK_NO_3_EV3 | BTM_SCO_PKT_TYPES_MASK_NO_2_EV5 | BTM_SCO_PKT_TYPES_MASK_NO_3_EV5)
-BTAPP_AV_SECMASK = (BTA_SEC_AUTHENTICATE | BTA_SEC_AUTHORIZE)
-BTA_AV_MAX_A2DP_MTU = 668
-PORCHE_PAIRING_CONFLICT = TRUE
-BTA_AV_CO_CP_SCMS_T = FALSE
-AVDT_CONNECT_CP_ONLY = FALSE
-BTL_CFG_USE_CONF_FILE = FALSE
-BTAPP_AHF_API_SUPPORT = TRUE
-HCILP_INCLUDED = TRUE
-HCISU_H4_INCLUDED = TRUE
-BT_TRACE_PROTOCOL = TRUE
-BT_USE_TRACES = TRUE
-BT_TRACE_BTIF = TRUE
-BTTRC_INCLUDED = FALSE
-BT_TRACE_VERBOSE = FALSE
-BTTRC_PARSER_INCLUDED = FALSE
-MAX_TRACE_RAM_SIZE = 10000
-OBX_INITIAL_TRACE_LEVEL = BT_TRACE_LEVEL_ERROR
-BTM_ALLOW_CONN_IF_NONDISCOVER = TRUE
-BTAPP_DM_SUPPORTED_SERVICES = (BTA_HSP_SERVICE_MASK | BTA_HFP_SERVICE_MASK | BTA_A2DP_SERVICE_MASK | BTA_HID_SERVICE_MASK | BTA_OPP_SERVICE_MASK | BTA_BPP_SERVICE_MASK)
-PBAP_ZERO_VCARD_IN_DB = FALSE
-BTA_DM_SDP_DB_SIZE = 8000
-MAX_L2CAP_CLIENTS = 15
-FTS_REJECT_INVALID_OBEX_SET_PATH_REQ = FALSE
-HID_HOST_MAX_CONN_RETRY = (3)
-BTM_DISC_DURING_RS = TRUE
-BTM_WBS_INCLUDED = FALSE
-HL_INCLUDED = TRUE
-NO_GKI_RUN_RETURN = TRUE
-AG_VOICE_SETTINGS = HCI_DEFAULT_VOICE_SETTINGS
-BTIF_DM_OOB_TEST = TRUE
-BTIF_HSAG_SERVICE_NAME = ("Headset Gateway")
-BTIF_HFAG_SERVICE_NAME = ("Handsfree Gateway")
-BTIF_HF_SERVICES = (BTA_HSP_SERVICE_MASK)
-BTIF_HF_SERVICE_NAMES = { BTIF_HSAG_SERVICE_NAME }
-BT_CLEAN_TURN_ON_DISABLED = TRUE
diff --git a/include/bt_target.h b/include/bt_target.h
index 5220134..2b47532 100755
--- a/include/bt_target.h
+++ b/include/bt_target.h
@@ -23,8 +23,26 @@
 #endif
 #include "data_types.h"
 
+
+#ifndef BTIF_HSAG_SERVICE_NAME
+#define BTIF_HSAG_SERVICE_NAME  ("Headset Gateway")
+#endif
+
+#ifndef BTIF_HFAG_SERVICE_NAME
+#define BTIF_HFAG_SERVICE_NAME  ("Handsfree Gateway")
+#endif
+
+
 #ifdef BUILDCFG
-#include "buildcfg.h"
+
+#if !defined(HAS_BDROID_BUILDCFG) && !defined(HAS_NO_BDROID_BUILDCFG)
+#error "An Android.mk file did not include bdroid_CFLAGS and possibly not bdorid_C_INCLUDES"
+#endif
+
+#ifdef HAS_BDROID_BUILDCFG
+#include "bdroid_buildcfg.h"
+#endif
+
 #endif
 
 /* Include common GKI definitions used by this platform */
@@ -33,6 +51,408 @@
 #include "bt_types.h"   /* This must be defined AFTER buildcfg.h */
 #include "dyn_mem.h"    /* defines static and/or dynamic memory for components */
 
+
+//------------------Added from Bluedroid buildcfg.h---------------------
+#ifndef UNV_INCLUDED
+#define UNV_INCLUDED FALSE
+#endif
+
+#ifndef GATT_PTS
+#define GATT_PTS FALSE
+#endif
+
+#ifndef L2CAP_INCLUDED
+#define L2CAP_INCLUDED TRUE
+#endif
+
+#ifndef L2CAP_EXTFEA_SUPPORTED_MASK
+#define L2CAP_EXTFEA_SUPPORTED_MASK (L2CAP_EXTFEA_ENH_RETRANS | L2CAP_EXTFEA_STREAM_MODE | L2CAP_EXTFEA_NO_CRC | L2CAP_EXTFEA_FIXED_CHNLS)
+#endif
+
+#ifndef BTUI_OPS_FORMATS
+#define BTUI_OPS_FORMATS (BTA_OP_VCARD21_MASK | BTA_OP_VCAL_MASK | BTA_OP_VNOTE_MASK | BTA_OP_ANY_MASK)
+#endif
+
+#ifndef BTA_RFC_MTU_SIZE
+#define BTA_RFC_MTU_SIZE (L2CAP_MTU_SIZE-L2CAP_MIN_OFFSET-RFCOMM_DATA_OVERHEAD)
+#endif
+
+#ifndef BTA_DUN_MTU
+#define BTA_DUN_MTU BTA_RFC_MTU_SIZE
+#endif
+
+#ifndef BTA_SPP_MTU
+#define BTA_SPP_MTU BTA_RFC_MTU_SIZE
+#endif
+
+#ifndef BTA_FAX_MTU
+#define BTA_FAX_MTU BTA_RFC_MTU_SIZE
+#endif
+
+#ifndef SDP_RAW_PDU_INCLUDED
+#define SDP_RAW_PDU_INCLUDED  TRUE
+#endif
+
+#ifndef GATTS_APPU_USE_GATT_TRACE
+#define GATTS_APPU_USE_GATT_TRACE FALSE
+#endif
+
+#ifndef SMP_HOST_ENCRYPT_INCLUDED
+#define SMP_HOST_ENCRYPT_INCLUDED FALSE
+#endif
+
+#ifndef SAP_INCLUDED
+#define SAP_INCLUDED FALSE
+#endif
+
+#ifndef SBC_NO_PCM_CPY_OPTION
+#define SBC_NO_PCM_CPY_OPTION FALSE
+#endif
+
+#ifndef SBC_IPAQ_OPT
+#define SBC_IPAQ_OPT FALSE
+#endif
+
+#ifndef SBC_IS_64_MULT_IN_QUANTIZER
+#define SBC_IS_64_MULT_IN_QUANTIZER FALSE
+#endif
+
+#ifndef BTA_INCLUDED
+#define BTA_INCLUDED TRUE
+#endif
+
+#ifndef BTA_AG_INCLUDED
+#define BTA_AG_INCLUDED  TRUE
+#endif
+
+#ifndef BTA_CT_INCLUDED
+#define BTA_CT_INCLUDED  FALSE
+#endif
+
+#ifndef BTA_CG_INCLUDED
+#define BTA_CG_INCLUDED  FALSE
+#endif
+
+#ifndef BTA_DG_INCLUDED
+#define BTA_DG_INCLUDED  FALSE
+#endif
+
+#ifndef BTA_FT_INCLUDED
+#define BTA_FT_INCLUDED FALSE
+#endif
+
+#ifndef BTA_OP_INCLUDED
+#define BTA_OP_INCLUDED FALSE
+#endif
+
+#ifndef BTA_PR_INCLUDED
+#define BTA_PR_INCLUDED FALSE
+#endif
+
+#ifndef BTA_SS_INCLUDED
+#define BTA_SS_INCLUDED FALSE
+#endif
+
+#ifndef BTA_DM_INCLUDED
+#define BTA_DM_INCLUDED TRUE
+#endif
+
+
+#ifndef BTA_DI_INCLUDED
+#define BTA_DI_INCLUDED FALSE
+#endif
+
+#ifndef BTA_BI_INCLUDED
+#define BTA_BI_INCLUDED FALSE
+#endif
+
+#ifndef BTA_SC_INCLUDED
+#define BTA_SC_INCLUDED FALSE
+#endif
+
+#ifndef BTA_PAN_INCLUDED
+#define BTA_PAN_INCLUDED TRUE
+#endif
+
+#ifndef BTA_FS_INCLUDED
+#define BTA_FS_INCLUDED TRUE
+#endif
+
+#ifndef BTA_AC_INCLUDED
+#define BTA_AC_INCLUDED FALSE
+#endif
+
+#ifndef BTA_HD_INCLUDED
+#define BTA_HD_INCLUDED FALSE
+#endif
+
+#ifndef BTA_HH_INCLUDED
+#define BTA_HH_INCLUDED TRUE
+#endif
+
+#ifndef BTA_HH_ROLE
+#define BTA_HH_ROLE BTA_MASTER_ROLE_PREF
+#endif
+
+#ifndef BTA_AR_INCLUDED
+#define BTA_AR_INCLUDED TRUE
+#endif
+
+#ifndef BTA_AV_INCLUDED
+#define BTA_AV_INCLUDED TRUE
+#endif
+
+#ifndef BTA_AV_VDP_INCLUDED
+#define BTA_AV_VDP_INCLUDED FALSE
+#endif
+
+#ifndef BTA_AVK_INCLUDED
+#define BTA_AVK_INCLUDED FALSE
+#endif
+
+#ifndef BTA_PBS_INCLUDED
+#define BTA_PBS_INCLUDED FALSE
+#endif
+
+#ifndef BTA_PBC_INCLUDED
+#define BTA_PBC_INCLUDED FALSE
+#endif
+
+#ifndef BTA_FM_INCLUDED
+#define BTA_FM_INCLUDED FALSE
+#endif
+
+#ifndef BTA_FM_DEBUG
+#define BTA_FM_DEBUG FALSE
+#endif
+
+#ifndef BTA_FMTX_INCLUDED
+#define BTA_FMTX_INCLUDED FALSE
+#endif
+
+#ifndef BTA_FMTX_DEBUG
+#define BTA_FMTX_DEBUG FALSE
+#endif
+
+#ifndef BTA_FMTX_FMRX_SWITCH_WORKAROUND
+#define BTA_FMTX_FMRX_SWITCH_WORKAROUND FALSE
+#endif
+
+#ifndef BTA_FMTX_US_FCC_RULES
+#define BTA_FMTX_US_FCC_RULES FALSE
+#endif
+
+#ifndef BTA_HS_INCLUDED
+#define BTA_HS_INCLUDED FALSE
+#endif
+
+#ifndef BTA_MSE_INCLUDED
+#define BTA_MSE_INCLUDED FALSE
+#endif
+
+#ifndef BTA_MCE_INCLUDED
+#define BTA_MCE_INCLUDED FALSE
+#endif
+
+#ifndef BTA_PLAYBACK_INCLUDED
+#define BTA_PLAYBACK_INCLUDED FALSE
+#endif
+
+#ifndef BTA_SSR_INCLUDED
+#define BTA_SSR_INCLUDED FALSE
+#endif
+
+#ifndef BTA_JV_INCLUDED
+#define BTA_JV_INCLUDED FALSE
+#endif
+
+#ifndef BTA_GATT_INCLUDED
+#define BTA_GATT_INCLUDED FALSE
+#endif
+
+#ifndef RPC_TRACE_ONLY
+#define RPC_TRACE_ONLY  FALSE
+#endif
+
+#ifndef ANDROID_APP_INCLUDED
+#define ANDROID_APP_INCLUDED  TRUE
+#endif
+
+#ifndef ANDROID_USE_LOGCAT
+#define ANDROID_USE_LOGCAT  TRUE
+#endif
+
+#ifndef LINUX_GKI_INCLUDED
+#define LINUX_GKI_INCLUDED  TRUE
+#endif
+
+#ifndef TICKS_PER_SEC
+#define TICKS_PER_SEC  100
+#endif
+
+#ifndef BTA_SYS_TIMER_PERIOD
+#define BTA_SYS_TIMER_PERIOD  100
+#endif
+
+#ifndef GKI_BUF1_SIZE
+#define GKI_BUF1_SIZE  288
+#endif
+
+#ifndef GKI_BUF3_MAX
+#define GKI_BUF3_MAX  200
+#endif
+
+#ifndef GKI_BUF3_SIZE
+#define GKI_BUF3_SIZE  (4096+16)
+#endif
+
+#ifndef GKI_BUF4_SIZE
+#define GKI_BUF4_SIZE  (8080+26)
+#endif
+
+#ifndef GKI_SHUTDOWN_EVT
+#define GKI_SHUTDOWN_EVT  APPL_EVT_7
+#endif
+
+#ifndef GKI_PTHREAD_JOINABLE
+#define GKI_PTHREAD_JOINABLE  TRUE
+#endif
+
+#ifndef LINUX_DRV_INCLUDED
+#define LINUX_DRV_INCLUDED  TRUE
+#endif
+
+#ifndef LINUX_OS
+#define LINUX_OS  TRUE
+#endif
+
+#ifndef BTU_TASK
+#define BTU_TASK  0
+#endif
+
+#ifndef BTIF_TASK
+#define BTIF_TASK  1
+#endif
+
+#ifndef A2DP_MEDIA_TASK
+#define A2DP_MEDIA_TASK  2
+#endif
+
+#ifndef GKI_MAX_TASKS
+#define GKI_MAX_TASKS  3
+#endif
+
+#ifndef BTM_APP_DEV_INIT
+#define BTM_APP_DEV_INIT  bte_main_post_reset_init
+#endif
+
+#ifndef SBC_FOR_EMBEDDED_LINUX
+#define SBC_FOR_EMBEDDED_LINUX TRUE
+#endif
+
+#ifndef BTA_DM_REMOTE_DEVICE_NAME_LENGTH
+#define BTA_DM_REMOTE_DEVICE_NAME_LENGTH 248
+#endif
+
+#ifndef AVDT_VERSION
+#define AVDT_VERSION  0x0102
+#endif
+
+#ifndef BTA_AG_AT_MAX_LEN
+#define BTA_AG_AT_MAX_LEN  512
+#endif
+
+#ifndef BTA_AVRCP_FF_RW_SUPPORT
+#define BTA_AVRCP_FF_RW_SUPPORT TRUE
+#endif
+
+#ifndef BTA_AG_SCO_PKT_TYPES
+#define BTA_AG_SCO_PKT_TYPES  (BTM_SCO_LINK_ONLY_MASK | BTM_SCO_PKT_TYPES_MASK_EV3 |  BTM_SCO_PKT_TYPES_MASK_NO_3_EV3 | BTM_SCO_PKT_TYPES_MASK_NO_2_EV5 | BTM_SCO_PKT_TYPES_MASK_NO_3_EV5)
+#endif
+
+#ifndef BTA_AV_MAX_A2DP_MTU
+#define BTA_AV_MAX_A2DP_MTU  668
+#endif
+
+#ifndef BTA_AV_RET_TOUT
+#define BTA_AV_RET_TOUT 15
+#endif
+
+#ifndef PORCHE_PAIRING_CONFLICT
+#define PORCHE_PAIRING_CONFLICT  TRUE
+#endif
+
+#ifndef BTA_AV_CO_CP_SCMS_T
+#define BTA_AV_CO_CP_SCMS_T  FALSE
+#endif
+
+#ifndef AVDT_CONNECT_CP_ONLY
+#define AVDT_CONNECT_CP_ONLY  FALSE
+#endif
+
+#ifndef BT_TRACE_PROTOCOL
+#define BT_TRACE_PROTOCOL  TRUE
+#endif
+
+#ifndef BT_USE_TRACES
+#define BT_USE_TRACES  TRUE
+#endif
+
+#ifndef BT_TRACE_BTIF
+#define BT_TRACE_BTIF  TRUE
+#endif
+
+#ifndef BTTRC_INCLUDED
+#define BTTRC_INCLUDED  FALSE
+#endif
+
+#ifndef BT_TRACE_VERBOSE
+#define BT_TRACE_VERBOSE  FALSE
+#endif
+
+#ifndef BTTRC_PARSER_INCLUDED
+#define BTTRC_PARSER_INCLUDED  FALSE
+#endif
+
+#ifndef MAX_TRACE_RAM_SIZE
+#define MAX_TRACE_RAM_SIZE  10000
+#endif
+
+#ifndef OBX_INITIAL_TRACE_LEVEL
+#define OBX_INITIAL_TRACE_LEVEL  BT_TRACE_LEVEL_ERROR
+#endif
+
+#ifndef PBAP_ZERO_VCARD_IN_DB
+#define PBAP_ZERO_VCARD_IN_DB  FALSE
+#endif
+
+#ifndef BTA_DM_SDP_DB_SIZE
+#define BTA_DM_SDP_DB_SIZE  8000
+#endif
+
+#ifndef FTS_REJECT_INVALID_OBEX_SET_PATH_REQ
+#define FTS_REJECT_INVALID_OBEX_SET_PATH_REQ FALSE
+#endif
+
+#ifndef HL_INCLUDED
+#define HL_INCLUDED  TRUE
+#endif
+
+#ifndef NO_GKI_RUN_RETURN
+#define NO_GKI_RUN_RETURN  TRUE
+#endif
+
+#ifndef AG_VOICE_SETTINGS
+#define AG_VOICE_SETTINGS  HCI_DEFAULT_VOICE_SETTINGS
+#endif
+
+#ifndef BTIF_DM_OOB_TEST
+#define BTIF_DM_OOB_TEST  TRUE
+#endif
+//------------------End added from Bluedroid buildcfg.h---------------------
+
+
+
 /* #define BYPASS_AVDATATRACE */
 
 /******************************************************************************
@@ -133,7 +553,7 @@
 
 /* Sends SDP data packets. */
 #ifndef SDP_POOL_ID
-#define SDP_POOL_ID                 GKI_POOL_ID_3
+#define SDP_POOL_ID                 3
 #endif
 
 /* Sends RFCOMM command packets. */
@@ -367,7 +787,7 @@
 **
 ******************************************************************************/
 #ifndef HCISU_H4_INCLUDED
-#define HCISU_H4_INCLUDED               FALSE
+#define HCISU_H4_INCLUDED               TRUE
 #endif
 
 #ifdef __cplusplus
@@ -436,7 +856,7 @@ BT_API extern void bte_main_lpm_allow_bt_device_sleep(void);
 /* if L2CAP_FCR_INCLUDED is TRUE then it should have 100 millisecond resolution */
 /* if none of them is included then QUICK_TIMER_TICKS_PER_SEC is set to 0 to exclude quick timer */
 #ifndef QUICK_TIMER_TICKS_PER_SEC
-#define QUICK_TIMER_TICKS_PER_SEC   100       /* 10ms timer */
+#define QUICK_TIMER_TICKS_PER_SEC   10       /* 10ms timer */
 #endif
 
 /******************************************************************************
@@ -448,7 +868,7 @@ BT_API extern void bte_main_lpm_allow_bt_device_sleep(void);
 set to FALSE for advanced start-up / shut-down procedures using USER_HW_ENABLE_API 
 and USER_HW_DISABLE_API macros */
 #ifndef BTM_AUTOMATIC_HCI_RESET
-#define BTM_AUTOMATIC_HCI_RESET      TRUE
+#define BTM_AUTOMATIC_HCI_RESET      FALSE
 #endif
 
 /* Include BTM Discovery database and code. */
@@ -488,7 +908,7 @@ and USER_HW_DISABLE_API macros */
 
 /* Includes WBS if TRUE */
 #ifndef BTM_WBS_INCLUDED
-#define BTM_WBS_INCLUDED            TRUE       /* TRUE includes WBS code */
+#define BTM_WBS_INCLUDED            FALSE       /* TRUE includes WBS code */
 #endif
 
 /* Includes PCM2 support if TRUE */
@@ -500,7 +920,7 @@ and USER_HW_DISABLE_API macros */
 **  issued while there is a role switch in progress
 */
 #ifndef BTM_DISC_DURING_RS
-#define BTM_DISC_DURING_RS FALSE
+#define BTM_DISC_DURING_RS TRUE
 #endif
 
 /**************************
@@ -518,7 +938,7 @@ and USER_HW_DISABLE_API macros */
 
 /* The size in bytes of the BTM inquiry database. */
 #ifndef BTM_INQ_DB_SIZE
-#define BTM_INQ_DB_SIZE             12
+#define BTM_INQ_DB_SIZE             40
 #endif
 
 /* This is set to enable automatic periodic inquiry at startup. */
@@ -578,7 +998,7 @@ and USER_HW_DISABLE_API macros */
 
 /* Should connections to unknown devices be allowed when not discoverable? */
 #ifndef BTM_ALLOW_CONN_IF_NONDISCOVER
-#define BTM_ALLOW_CONN_IF_NONDISCOVER   FALSE
+#define BTM_ALLOW_CONN_IF_NONDISCOVER   TRUE
 #endif
 
 /* When connectable mode is set to TRUE, the device will respond to paging. */
@@ -633,7 +1053,7 @@ and USER_HW_DISABLE_API macros */
 
 /* Whether BTA is included in BTU task. */
 #ifndef BTU_BTA_INCLUDED
-#define BTU_BTA_INCLUDED            FALSE
+#define BTU_BTA_INCLUDED            TRUE
 #endif
 
 /* Number of seconds to wait to send an HCI Reset command upon device initialization. */
@@ -653,7 +1073,7 @@ and USER_HW_DISABLE_API macros */
 
 /* The number of SCO links. */
 #ifndef BTM_MAX_SCO_LINKS
-#define BTM_MAX_SCO_LINKS           3
+#define BTM_MAX_SCO_LINKS           2
 #endif
 
 /* The preferred type of SCO links (2-eSCO, 0-SCO). */
@@ -663,33 +1083,33 @@ and USER_HW_DISABLE_API macros */
 
 /* The number of security records for peer devices. */
 #ifndef BTM_SEC_MAX_DEVICE_RECORDS
-#define BTM_SEC_MAX_DEVICE_RECORDS  8
+#define BTM_SEC_MAX_DEVICE_RECORDS  100
 #endif
 
 /* The number of security records for services. */
 #ifndef BTM_SEC_MAX_SERVICE_RECORDS
-#define BTM_SEC_MAX_SERVICE_RECORDS 30
+#define BTM_SEC_MAX_SERVICE_RECORDS 32
 #endif
 
 /* If True, force a retrieval of remote device name for each bond in case it's changed */
 #ifndef BTM_SEC_FORCE_RNR_FOR_DBOND
-#define BTM_SEC_FORCE_RNR_FOR_DBOND  TRUE
+#define BTM_SEC_FORCE_RNR_FOR_DBOND  FALSE
 #endif
 
 /* Maximum device name length used in btm database. */
 #ifndef BTM_MAX_REM_BD_NAME_LEN
-#define BTM_MAX_REM_BD_NAME_LEN     20
+#define BTM_MAX_REM_BD_NAME_LEN     248
 #endif
 
 /* Maximum local device name length stored btm database.
   '0' disables storage of the local name in BTM */
 #ifndef BTM_MAX_LOC_BD_NAME_LEN
-#define BTM_MAX_LOC_BD_NAME_LEN     31
+#define BTM_MAX_LOC_BD_NAME_LEN     248
 #endif
 
 /* TRUE if default string is used, FALSE if device name is set in the application */
 #ifndef BTM_USE_DEF_LOCAL_NAME
-#define BTM_USE_DEF_LOCAL_NAME      FALSE
+#define BTM_USE_DEF_LOCAL_NAME      TRUE
 #endif
 
 /* Fixed Default String (Ignored if BTM_USE_DEF_LOCAL_NAME is FALSE) */
@@ -840,12 +1260,12 @@ and USER_HW_DISABLE_API macros */
 /* Flow control and retransmission mode */
 
 #ifndef L2CAP_FCR_INCLUDED
-#define L2CAP_FCR_INCLUDED FALSE
+#define L2CAP_FCR_INCLUDED TRUE
 #endif
 
 /* The maximum number of simultaneous links that L2CAP can support. */
 #ifndef MAX_ACL_CONNECTIONS
-#define MAX_L2CAP_LINKS             4
+#define MAX_L2CAP_LINKS             7
 #else
 #define MAX_L2CAP_LINKS             MAX_ACL_CONNECTIONS
 #endif
@@ -857,12 +1277,12 @@ and USER_HW_DISABLE_API macros */
 
 /* The maximum number of simultaneous applications that can register with L2CAP. */
 #ifndef MAX_L2CAP_CLIENTS
-#define MAX_L2CAP_CLIENTS           8
+#define MAX_L2CAP_CLIENTS           15
 #endif
 
 /* The number of seconds of link inactivity before a link is disconnected. */
 #ifndef L2CAP_LINK_INACTIVITY_TOUT
-#define L2CAP_LINK_INACTIVITY_TOUT  3
+#define L2CAP_LINK_INACTIVITY_TOUT  4
 #endif
 
 /* The number of seconds of link inactivity after bonding before a link is disconnected. */
@@ -1128,24 +1548,25 @@ and USER_HW_DISABLE_API macros */
 
 /* The maximum number of attributes in each record. */
 #ifndef SDP_MAX_REC_ATTR
-#if defined(HID_DEV_INCLUDED) && (HID_DEV_INCLUDED==TRUE)
+//#if defined(HID_DEV_INCLUDED) && (HID_DEV_INCLUDED==TRUE)
 #define SDP_MAX_REC_ATTR            25
-#else
-#define SDP_MAX_REC_ATTR            13
-#endif
+//#else
+//#define SDP_MAX_REC_ATTR            13
+//#endif
 #endif
 
 #ifndef SDP_MAX_PAD_LEN
-#define SDP_MAX_PAD_LEN             350
+#define SDP_MAX_PAD_LEN             600
 #endif
 
 /* The maximum length, in bytes, of an attribute. */
 #ifndef SDP_MAX_ATTR_LEN
-#if defined(HID_DEV_INCLUDED) && (HID_DEV_INCLUDED==TRUE)
-#define SDP_MAX_ATTR_LEN            80
-#else
-#define SDP_MAX_ATTR_LEN            100
-#endif
+//#if defined(HID_DEV_INCLUDED) && (HID_DEV_INCLUDED==TRUE)
+//#define SDP_MAX_ATTR_LEN            80
+//#else
+//#define SDP_MAX_ATTR_LEN            100
+//#endif
+#define SDP_MAX_ATTR_LEN            400
 #endif
 
 /* The maximum number of attribute filters supported by SDP databases. */
@@ -1205,7 +1626,7 @@ and USER_HW_DISABLE_API macros */
 
 /* Device identification feature. */
 #ifndef SDP_DI_INCLUDED
-#define SDP_DI_INCLUDED             FALSE
+#define SDP_DI_INCLUDED             TRUE
 #endif
 
 /******************************************************************************
@@ -1215,69 +1636,69 @@ and USER_HW_DISABLE_API macros */
 ******************************************************************************/
 
 #ifndef RFCOMM_INCLUDED
-#define RFCOMM_INCLUDED             FALSE
+#define RFCOMM_INCLUDED             TRUE
 #endif
 
 /* The maximum number of ports supported. */
 #ifndef MAX_RFC_PORTS
-#define MAX_RFC_PORTS               5
+#define MAX_RFC_PORTS               30
 #endif
 
 /* The maximum simultaneous links to different devices. */
 #ifndef MAX_ACL_CONNECTIONS
-#define MAX_BD_CONNECTIONS          1
+#define MAX_BD_CONNECTIONS          7
 #else
 #define MAX_BD_CONNECTIONS          MAX_ACL_CONNECTIONS
 #endif
 
 /* The port receive queue low watermark level, in bytes. */
 #ifndef PORT_RX_LOW_WM
-#define PORT_RX_LOW_WM              5000
+#define PORT_RX_LOW_WM              (BTA_RFC_MTU_SIZE * PORT_RX_BUF_LOW_WM)
 #endif
 
 /* The port receive queue high watermark level, in bytes. */
 #ifndef PORT_RX_HIGH_WM
-#define PORT_RX_HIGH_WM             8000
+#define PORT_RX_HIGH_WM             (BTA_RFC_MTU_SIZE * PORT_RX_BUF_HIGH_WM)
 #endif
 
 /* The port receive queue critical watermark level, in bytes. */
 #ifndef PORT_RX_CRITICAL_WM
-#define PORT_RX_CRITICAL_WM         12000
+#define PORT_RX_CRITICAL_WM         (BTA_RFC_MTU_SIZE * PORT_RX_BUF_CRITICAL_WM)
 #endif
 
 /* The port receive queue low watermark level, in number of buffers. */
 #ifndef PORT_RX_BUF_LOW_WM
-#define PORT_RX_BUF_LOW_WM          8
+#define PORT_RX_BUF_LOW_WM          4
 #endif
 
 /* The port receive queue high watermark level, in number of buffers. */
 #ifndef PORT_RX_BUF_HIGH_WM
-#define PORT_RX_BUF_HIGH_WM         16
+#define PORT_RX_BUF_HIGH_WM         10
 #endif
 
 /* The port receive queue critical watermark level, in number of buffers. */
 #ifndef PORT_RX_BUF_CRITICAL_WM
-#define PORT_RX_BUF_CRITICAL_WM     22
+#define PORT_RX_BUF_CRITICAL_WM     15
 #endif
 
 /* The port transmit queue high watermark level, in bytes. */
 #ifndef PORT_TX_HIGH_WM
-#define PORT_TX_HIGH_WM             8000
+#define PORT_TX_HIGH_WM             (BTA_RFC_MTU_SIZE * PORT_TX_BUF_HIGH_WM)
 #endif
 
 /* The port transmit queue critical watermark level, in bytes. */
 #ifndef PORT_TX_CRITICAL_WM
-#define PORT_TX_CRITICAL_WM         10000
+#define PORT_TX_CRITICAL_WM         (BTA_RFC_MTU_SIZE * PORT_TX_BUF_CRITICAL_WM)
 #endif
 
 /* The port transmit queue high watermark level, in number of buffers. */
 #ifndef PORT_TX_BUF_HIGH_WM
-#define PORT_TX_BUF_HIGH_WM         16
+#define PORT_TX_BUF_HIGH_WM         10
 #endif
 
 /* The port transmit queue high watermark level, in number of buffers. */
 #ifndef PORT_TX_BUF_CRITICAL_WM
-#define PORT_TX_BUF_CRITICAL_WM     22
+#define PORT_TX_BUF_CRITICAL_WM     15
 #endif
 
 /* The RFCOMM multiplexer preferred flow control mechanism. */
@@ -1565,7 +1986,7 @@ Range: Minimum 12000 (12 secs) on BR/EDR when supporting PBF.
 ******************************************************************************/
 
 #ifndef BNEP_INCLUDED
-#define BNEP_INCLUDED               FALSE
+#define BNEP_INCLUDED               TRUE
 #endif
 
 /* Protocol filtering is an optional feature. Bydefault it will be turned on */
@@ -1644,7 +2065,7 @@ Range: Minimum 12000 (12 secs) on BR/EDR when supporting PBF.
 ******************************************************************************/
 
 #ifndef AVDT_INCLUDED
-#define AVDT_INCLUDED               FALSE
+#define AVDT_INCLUDED               TRUE
 #endif
 
 /* Include reporting capability in AVDTP */
@@ -1711,7 +2132,7 @@ Range: Minimum 12000 (12 secs) on BR/EDR when supporting PBF.
 ******************************************************************************/
 
 #ifndef PAN_INCLUDED
-#define PAN_INCLUDED                     FALSE
+#define PAN_INCLUDED                     TRUE
 #endif
 
 /* This will enable the PANU role */
@@ -2059,7 +2480,7 @@ Range: Minimum 12000 (12 secs) on BR/EDR when supporting PBF.
 
 /* keep the raw data received from SDP server in database. */
 #ifndef SDP_RAW_DATA_INCLUDED
-#define SDP_RAW_DATA_INCLUDED       FALSE
+#define SDP_RAW_DATA_INCLUDED       TRUE
 #endif
 
 /* TRUE, to allow JV to create L2CAP connection on SDP PSM. */
@@ -2449,7 +2870,7 @@ Range: Minimum 12000 (12 secs) on BR/EDR when supporting PBF.
 ** Definitions for HID-Host
 */
 #ifndef  HID_HOST_INCLUDED
-#define HID_HOST_INCLUDED           FALSE
+#define HID_HOST_INCLUDED           TRUE
 #endif
 
 #ifndef HID_HOST_MAX_DEVICES
@@ -2465,7 +2886,7 @@ Range: Minimum 12000 (12 secs) on BR/EDR when supporting PBF.
 #endif
 
 #ifndef HID_HOST_MAX_CONN_RETRY
-#define HID_HOST_MAX_CONN_RETRY     (15)
+#define HID_HOST_MAX_CONN_RETRY     (3)
 #endif
 
 #ifndef HID_HOST_REPAGE_WIN
@@ -2496,7 +2917,7 @@ Range: Minimum 12000 (12 secs) on BR/EDR when supporting PBF.
 
 /* This is set to enable GOEP non-blocking file system access functions. */
 #ifndef GOEP_FS_INCLUDED
-#define GOEP_FS_INCLUDED        TRUE
+#define GOEP_FS_INCLUDED        FALSE
 #endif
 
 /* GOEP authentication key size. */
@@ -2988,7 +3409,7 @@ Range: Minimum 12000 (12 secs) on BR/EDR when supporting PBF.
  * A2DP Definitions
  */
 #ifndef A2D_INCLUDED
-#define A2D_INCLUDED            FALSE
+#define A2D_INCLUDED            TRUE
 #endif
 
 /* TRUE to include SBC utility functions */
@@ -3013,7 +3434,7 @@ Range: Minimum 12000 (12 secs) on BR/EDR when supporting PBF.
 ******************************************************************************/
 
 #ifndef AVCT_INCLUDED
-#define AVCT_INCLUDED               FALSE
+#define AVCT_INCLUDED               TRUE
 #endif
 
 /* Number of simultaneous ACL links to different peer devices. */
@@ -3104,7 +3525,7 @@ Range: Minimum 12000 (12 secs) when supporting PBF.
 ******************************************************************************/
 
 #ifndef AVRC_INCLUDED
-#define AVRC_INCLUDED               FALSE
+#define AVRC_INCLUDED               TRUE
 #endif
 
 /******************************************************************************
@@ -3341,12 +3762,12 @@ The maximum number of payload octets that the local device can receive in a sing
 ******************************************************************************/
 /* When TRUE indicates that an application task is to be run */
 #ifndef APPL_INCLUDED
-#define APPL_INCLUDED                FALSE
+#define APPL_INCLUDED                TRUE
 #endif
 
 /* When TRUE remote terminal code included (RPC MUST be included) */
 #ifndef RSI_INCLUDED
-#define RSI_INCLUDED                FALSE
+#define RSI_INCLUDED                TRUE
 #endif
 
 
@@ -3398,7 +3819,7 @@ The maximum number of payload octets that the local device can receive in a sing
 #endif
 
 #ifndef BTE_IDLE_TASK_INCLUDED 
-#define BTE_IDLE_TASK_INCLUDED TRUE
+#define BTE_IDLE_TASK_INCLUDED FALSE
 #endif
 
 #ifndef BTE_PLATFORM_INITHW
@@ -3409,7 +3830,6 @@ The maximum number of payload octets that the local device can receive in a sing
 #define BTE_BTA_CODE_INCLUDED FALSE
 #endif
 
-
 /******************************************************************************
 **
 ** BTTRC
diff --git a/include/buildcfg.mk b/include/buildcfg.mk
deleted file mode 100644
index 7d1562e..0000000
--- a/include/buildcfg.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-intermediates := $(local-intermediates-dir)
-
-SRC := $(call my-dir)/$(addprefix bdroid_, $(addsuffix .txt,$(basename $(TARGET_DEVICE))))
-ifeq (,$(wildcard $(SRC)))
-# configuration file does not exist. Use default one
-SRC := $(call my-dir)/bdroid_generic.txt
-endif
-GEN := $(intermediates)/buildcfg.h
-TOOL := $(call my-dir)/../tools/gen-buildcfg.sh
-
-$(GEN): PRIVATE_PATH := $(call my-dir)
-$(GEN): PRIVATE_CUSTOM_TOOL = $(TOOL) $< $@
-$(GEN): $(SRC)  $(TOOL)
-	$(transform-generated-source)
-
-LOCAL_GENERATED_SOURCES += $(GEN)
diff --git a/include/gki_target.h b/include/gki_target.h
index d1541af..09aee17 100644
--- a/include/gki_target.h
+++ b/include/gki_target.h
@@ -16,11 +16,7 @@
 #ifndef GKI_TARGET_H
 #define GKI_TARGET_H
 
-#ifdef BUILDCFG
-#include "buildcfg.h"
-#endif
-
-#include "data_types.h"
+#include "bt_target.h"
 
 /* Operating System Selection */
 #ifndef BTE_SIM_APP
diff --git a/main/Android.mk b/main/Android.mk
index 41cac93..1f1d60c 100755
--- a/main/Android.mk
+++ b/main/Android.mk
@@ -86,9 +86,10 @@ LOCAL_C_INCLUDES+= . \
 	$(LOCAL_PATH)/../hci/include\
 	$(LOCAL_PATH)/../brcm/include \
 	$(LOCAL_PATH)/../embdrv/sbc/encoder/include \
-	$(LOCAL_PATH)/../audio_a2dp_hw
+	$(LOCAL_PATH)/../audio_a2dp_hw \
+	$(bdroid_C_INCLUDES) \
 
-LOCAL_CFLAGS += -DBUILDCFG -Werror -Wno-error=maybe-uninitialized -Wno-error=uninitialized
+LOCAL_CFLAGS += -DBUILDCFG $(bdroid_CFLAGS) -Werror -Wno-error=maybe-uninitialized -Wno-error=uninitialized
 
 ifeq ($(TARGET_PRODUCT), full_crespo)
      LOCAL_CFLAGS += -DTARGET_CRESPO
@@ -121,6 +122,4 @@ LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_CLASS := SHARED_LIBRARIES
 LOCAL_REQUIRED_MODULES := libbt-hci libbt-vendor bt_stack.conf bt_did.conf auto_pair_devlist.conf
 
-include $(LOCAL_PATH)/../include/buildcfg.mk
-
 include $(BUILD_SHARED_LIBRARY)
diff --git a/stack/Android.mk b/stack/Android.mk
index d2ccaff..f209fb7 100644
--- a/stack/Android.mk
+++ b/stack/Android.mk
@@ -27,7 +27,10 @@ LOCAL_C_INCLUDES:= . \
                    $(LOCAL_PATH)/../ctrlr/include \
                    $(LOCAL_PATH)/../bta/include \
                    $(LOCAL_PATH)/../bta/sys \
-                   $(LOCAL_PATH)/../brcm/include
+                   $(LOCAL_PATH)/../brcm/include \
+                   $(bdroid_C_INCLUDES) \
+
+LOCAL_CFLAGS += $(bdroid_CFLAGS)
 
 ifeq ($(BOARD_HAVE_BLUETOOTH_BCM),true)
 LOCAL_CFLAGS += \
@@ -132,8 +135,6 @@ LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_CLASS := STATIC_LIBRARIES
 LOCAL_SHARED_LIBRARIES := libcutils libc
 
-include $(LOCAL_PATH)/../include/buildcfg.mk
-
 include $(BUILD_STATIC_LIBRARY)
 
 endif  # TARGET_SIMULATOR != true
diff --git a/stack/btm/btm_inq.c b/stack/btm/btm_inq.c
index a67f723..2339150 100644
--- a/stack/btm/btm_inq.c
+++ b/stack/btm/btm_inq.c
@@ -116,8 +116,8 @@ const UINT16 BTM_EIR_UUID_LKUP_TBL[BTM_EIR_MAX_SERVICES] =
 };
 #else
 /*
-If customized UUID look-up table needs to be used, 
-the followings should be defined in buildcfg.h.
+If customized UUID look-up table needs to be used,
+the followings should be defined in bdroid_buildcfg.h.
 BTM_EIR_UUID_LKUP_TBL = <customized UUID list>
 BTM_EIR_MAX_SERVICES = <number of UUID in list>
 */
diff --git a/stack/include/dyn_mem.h b/stack/include/dyn_mem.h
index 58d4579..c243fe8 100644
--- a/stack/include/dyn_mem.h
+++ b/stack/include/dyn_mem.h
@@ -14,7 +14,7 @@
 #define DYN_MEM_H
 
 /****************************************************************************
-** Define memory usage for GKI (if not defined in buildcfg.h)
+** Define memory usage for GKI (if not defined in bdroid_buildcfg.h)
 **  The default for GKI is to use static memory allocation for its control
 **  block.
 */
@@ -23,7 +23,7 @@
 #endif
 
 /****************************************************************************
-** Define memory usage for each CORE component (if not defined in buildcfg.h)
+** Define memory usage for each CORE component (if not defined in bdroid_buildcfg.h)
 **  The default for each component is to use static memory allocations.
 */
 #ifndef BTU_DYNAMIC_MEMORY
@@ -79,7 +79,7 @@
 #endif
 
 /****************************************************************************
-** Define memory usage for each PROFILE component (if not defined in buildcfg.h)
+** Define memory usage for each PROFILE component (if not defined in bdroid_buildcfg.h)
 **  The default for each component is to use static memory allocations.
 */
 #ifndef A2D_DYNAMIC_MEMORY
@@ -163,7 +163,7 @@
 #endif
 
 /****************************************************************************
-** Define memory usage for BTA (if not defined in buildcfg.h)
+** Define memory usage for BTA (if not defined in bdroid_buildcfg.h)
 **  The default for each component is to use static memory allocations.
 */
 #ifndef BTA_DYNAMIC_MEMORY
@@ -171,7 +171,7 @@
 #endif
 
 /****************************************************************************
-** Define memory usage for BT Trace (if not defined in buildcfg.h)
+** Define memory usage for BT Trace (if not defined in bdroid_buildcfg.h)
 **  The default is to use static memory allocations.
 */
 #ifndef BTTRC_DYNAMIC_MEMORY