diff options
| author | Mattias Agren <magren@broadcom.com> | 2012-04-11 13:14:44 -0700 |
|---|---|---|
| committer | Matthew Xie <mattx@google.com> | 2012-07-14 11:19:17 -0700 |
| commit | 2f9c0a7966a08936e8ae7a03ab8fbf1de3b22e0e (patch) | |
| tree | 524f260c46e0960216900dda7559f6f87e5873f3 /main | |
| parent | 8e6e9356d5386501d5e0988ce23d0c9aaed31a64 (diff) | |
| download | external_bluetooth_bluedroid-2f9c0a7966a08936e8ae7a03ab8fbf1de3b22e0e.zip external_bluetooth_bluedroid-2f9c0a7966a08936e8ae7a03ab8fbf1de3b22e0e.tar.gz external_bluetooth_bluedroid-2f9c0a7966a08936e8ae7a03ab8fbf1de3b22e0e.tar.bz2 | |
Always check if reconfig is needed prior to starting an
avdtp stream. Added autoadjusting bitpool if sink requests
a particular range within our exported capability.
Cleanup & fixing file permissions.
Change-Id: Ib5638706d4baef072c79a70ce1497140c3357a0d
Diffstat (limited to 'main')
| -rwxr-xr-x | main/Android.mk | 81 |
1 files changed, 39 insertions, 42 deletions
diff --git a/main/Android.mk b/main/Android.mk index e7f005f..c8fbb40 100755 --- a/main/Android.mk +++ b/main/Android.mk @@ -8,15 +8,15 @@ include $(CLEAR_VARS) # HAL layer LOCAL_SRC_FILES:= \ - ../btif/src/bluetooth.c + ../btif/src/bluetooth.c # platform specific LOCAL_SRC_FILES+= \ - bte_main.c \ - bte_init.c \ - bte_version.c \ - bte_logmsg.c \ - bte_conf.c + bte_main.c \ + bte_init.c \ + bte_version.c \ + bte_logmsg.c \ + bte_conf.c # BTIF LOCAL_SRC_FILES += \ @@ -35,8 +35,8 @@ LOCAL_SRC_FILES += \ ../btif/src/btif_sock_rfc.c \ ../btif/src/btif_sock_thread.c \ ../btif/src/btif_sock_sdp.c \ - ../btif/src/btif_pan.c \ - ../btif/src/btif_sock_util.c + ../btif/src/btif_sock_util.c \ + ../btif/src/btif_pan.c # callouts LOCAL_SRC_FILES+= \ @@ -51,44 +51,41 @@ LOCAL_SRC_FILES+= \ # sbc encoder LOCAL_SRC_FILES+= \ - ../embdrv/sbc/encoder/srce/sbc_analysis.c \ - ../embdrv/sbc/encoder/srce/sbc_dct.c \ - ../embdrv/sbc/encoder/srce/sbc_dct_coeffs.c \ - ../embdrv/sbc/encoder/srce/sbc_enc_bit_alloc_mono.c \ - ../embdrv/sbc/encoder/srce/sbc_enc_bit_alloc_ste.c \ - ../embdrv/sbc/encoder/srce/sbc_enc_coeffs.c \ - ../embdrv/sbc/encoder/srce/sbc_encoder.c \ - ../embdrv/sbc/encoder/srce/sbc_packing.c \ + ../embdrv/sbc/encoder/srce/sbc_analysis.c \ + ../embdrv/sbc/encoder/srce/sbc_dct.c \ + ../embdrv/sbc/encoder/srce/sbc_dct_coeffs.c \ + ../embdrv/sbc/encoder/srce/sbc_enc_bit_alloc_mono.c \ + ../embdrv/sbc/encoder/srce/sbc_enc_bit_alloc_ste.c \ + ../embdrv/sbc/encoder/srce/sbc_enc_coeffs.c \ + ../embdrv/sbc/encoder/srce/sbc_encoder.c \ + ../embdrv/sbc/encoder/srce/sbc_packing.c \ - -# candidates for vendor lib (keep here for now) LOCAL_SRC_FILES+= \ - ../udrv/ulinux/unv_linux.c\ - ../udrv/ulinux/uipc.c - + ../udrv/ulinux/unv_linux.c\ + ../udrv/ulinux/uipc.c LOCAL_C_INCLUDES+= . \ - $(LOCAL_PATH)/../bta/include \ - $(LOCAL_PATH)/../bta/sys \ - $(LOCAL_PATH)/../bta/dm \ - $(LOCAL_PATH)/../gki/common \ - $(LOCAL_PATH)/../gki/ulinux \ - $(LOCAL_PATH)/../include \ - $(LOCAL_PATH)/../stack/include \ - $(LOCAL_PATH)/../stack/l2cap \ - $(LOCAL_PATH)/../stack/a2dp \ - $(LOCAL_PATH)/../stack/btm \ - $(LOCAL_PATH)/../stack/avdt \ - $(LOCAL_PATH)/../hcis \ - $(LOCAL_PATH)/../hcis/include \ - $(LOCAL_PATH)/../hcis/patchram \ - $(LOCAL_PATH)/../udrv/include \ - $(LOCAL_PATH)/../btif/include \ - $(LOCAL_PATH)/../btif/co \ - $(LOCAL_PATH)/../vendor/libvendor/include\ - $(LOCAL_PATH)/../brcm/include \ - $(LOCAL_PATH)/../embdrv/sbc/encoder/include \ - $(LOCAL_PATH)/../audio_a2dp_hw + $(LOCAL_PATH)/../bta/include \ + $(LOCAL_PATH)/../bta/sys \ + $(LOCAL_PATH)/../bta/dm \ + $(LOCAL_PATH)/../gki/common \ + $(LOCAL_PATH)/../gki/ulinux \ + $(LOCAL_PATH)/../include \ + $(LOCAL_PATH)/../stack/include \ + $(LOCAL_PATH)/../stack/l2cap \ + $(LOCAL_PATH)/../stack/a2dp \ + $(LOCAL_PATH)/../stack/btm \ + $(LOCAL_PATH)/../stack/avdt \ + $(LOCAL_PATH)/../hcis \ + $(LOCAL_PATH)/../hcis/include \ + $(LOCAL_PATH)/../hcis/patchram \ + $(LOCAL_PATH)/../udrv/include \ + $(LOCAL_PATH)/../btif/include \ + $(LOCAL_PATH)/../btif/co \ + $(LOCAL_PATH)/../vendor/libvendor/include\ + $(LOCAL_PATH)/../brcm/include \ + $(LOCAL_PATH)/../embdrv/sbc/encoder/include \ + $(LOCAL_PATH)/../audio_a2dp_hw LOCAL_CFLAGS += -DBUILDCFG -Werror |