Merge branch 'master' into feature/btdm_avrc

diff --cc components/bt/Kconfig
index c38518a5378a3bedbec77f2f0dd3a94fcacc1928,9b329e61e29841138fbb2302b87cb0496b121904..d9021e9601bfef59b0959df49c27b695fca26e7b
--- 1/components/bt/Kconfig
--- 2/components/bt/Kconfig
+++ b/components/bt/Kconfig
@@@ -1,35 -1,37 +1,42 @@@
  menuconfig BT_ENABLED
      bool "Bluetooth"
      help
-         Select this option to enable Bluetooth stack and show the submenu with Bluetooth configuration choices.
+         Select this option to enable Bluetooth and show the submenu with Bluetooth configuration choices.
+ 
 -config BLUEDROID_ENABLED
++menuconfig BLUEDROID_ENABLED
+       bool "Bluedroid Bluetooth stack enabled"
+     depends on BT_ENABLED
+       default y
+       help
+               This enables the default Bluedroid Bluetooth stack
  
  config BTC_TASK_STACK_SIZE
 -      int "Bluetooth event (callback to application) task stack size"
 -    depends on BT_ENABLED
 -      default 3072
 -      help
 -              This select btc task stack size
 +    int "Bluetooth event (callback to application) task stack size"
-     depends on BT_ENABLED
++    depends on BLUEDROID_ENABLED
 +    default 3072
 +    help
 +        This select btc task stack size
  
  config BLUEDROID_MEM_DEBUG
 -      bool "Bluedroid memory debug"
 -    depends on BT_ENABLED
 -      default n
 -      help
 -              Bluedroid memory debug
 +    bool "Bluedroid memory debug"
-     depends on BT_ENABLED
++    depends on BLUEDROID_ENABLED
 +    default n
 +    help
 +        Bluedroid memory debug
 +
 +config CLASSIC_BT_ENABLED
 +    bool "Classic Bluetooth"
-     depends on BT_ENABLED
++    depends on BLUEDROID_ENABLED
 +    default n
  
  config BT_DRAM_RELEASE
 -      bool "Release DRAM from Classic BT controller"
 -    depends on BT_ENABLED
 -      default n
 -      help
 -              This option should only be used when BLE only.
 -              Open this option will release about 30K DRAM from Classic BT.
 -              The released DRAM will be used as system heap memory.
 +    bool "Release DRAM from Classic BT controller"
-     depends on BT_ENABLED && !CLASSIC_BT_ENABLED
++    depends on BT_ENABLED && (!BLUEDROID_ENABLED || (BLUEDROID_ENABLED && !CLASSIC_BT_ENABLED))
 +    default n
 +    help
 +        This option should only be used when BLE only.
 +        Enabling this option will release about 30K DRAM from Classic BT.
 +        The released DRAM will be used as system heap memory.
  
  # Memory reserved at start of DRAM for Bluetooth stack
  config BT_RESERVE_DRAM

diff --cc components/bt/component.mk
index d9d6e1cf3a2c64548d8cd8c6d0132b685c5e2bbe,f93cc5204ae58251c092eb1b246766621a82b564..8f6ce29d518b6a460d5afaff5bbc661362828475
--- 1/components/bt/component.mk
--- 2/components/bt/component.mk
+++ b/components/bt/component.mk
@@@ -29,25 -45,11 +48,16 @@@ COMPONENT_ADD_INCLUDEDIRS +=       bluedroid/
                                bluedroid/stack/l2cap/include           \
                                bluedroid/stack/sdp/include             \
                                bluedroid/stack/smp/include             \
 +                              bluedroid/stack/avct/include            \
 +                              bluedroid/stack/avrc/include            \
 +                              bluedroid/stack/avdt/include            \
 +                              bluedroid/stack/a2dp/include            \
                                bluedroid/stack/include                 \
 -                              bluedroid/api/include           \
 +                              bluedroid/utils/include                 \
 +                              bluedroid/api/include                   \
                                bluedroid/include                       \
-                               include 
- 
- LIBS := btdm_app
- 
- COMPONENT_ADD_LDFLAGS := -lbt -L $(COMPONENT_PATH)/lib \
-                            $(addprefix -l,$(LIBS))
- 
- # re-link program if BT binary libs change
- COMPONENT_ADD_LINKER_DEPS := $(patsubst %,$(COMPONENT_PATH)/lib/lib%.a,$(LIBS))
  
- COMPONENT_SRCDIRS :=  bluedroid/bta/dm                        \
+ COMPONENT_SRCDIRS +=  bluedroid/bta/dm                        \
                        bluedroid/bta/gatt                      \
                        bluedroid/bta/hh                        \
                        bluedroid/bta/sdp                       \
@@@ -79,16 -76,8 +89,13 @@@
                        bluedroid/stack/l2cap                   \
                        bluedroid/stack/sdp                     \
                        bluedroid/stack/smp                     \
 +                      bluedroid/stack/avct                    \
 +                      bluedroid/stack/avrc                    \
 +                      bluedroid/stack/avdt                    \
 +                      bluedroid/stack/a2dp                    \
                        bluedroid/stack                         \
 +                      bluedroid/utils                         \
                        bluedroid/api                   \
                        bluedroid                               \
-                       .
- 
- COMPONENT_SUBMODULES += lib
  
  endif