summaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorHarish Paryani <hparyani@broadcom.com>2012-04-03 23:49:45 -0700
committerMatthew Xie <mattx@google.com>2012-07-14 11:19:14 -0700
commit66aa5171e4e7c9f942971a30419c03134e67a4a4 (patch)
tree60fe10f29e7c3a574dcc317567a3c9bf05c85387 /main
parent04db88d9bd23fa98916e031987f3ba2063783acc (diff)
downloadexternal_bluetooth_bluedroid-66aa5171e4e7c9f942971a30419c03134e67a4a4.zip
external_bluetooth_bluedroid-66aa5171e4e7c9f942971a30419c03134e67a4a4.tar.gz
external_bluetooth_bluedroid-66aa5171e4e7c9f942971a30419c03134e67a4a4.tar.bz2
Check in for - new rfc multi accept code
Change-Id: I66794a8821481c58e045bb8acd8b7b758900d3e9
Diffstat (limited to 'main')
-rwxr-xr-xmain/Android.mk33
1 files changed, 19 insertions, 14 deletions
diff --git a/main/Android.mk b/main/Android.mk
index 816fb6f..0de4afc 100755
--- a/main/Android.mk
+++ b/main/Android.mk
@@ -10,13 +10,13 @@ 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_init.c \
+ bte_version.c \
bte_logmsg.c \
bte_conf.c
@@ -32,7 +32,12 @@ LOCAL_SRC_FILES += \
../btif/src/btif_rc.c \
../btif/src/btif_media_task.c \
../btif/src/btif_hh.c \
- ../btif/src/btif_hl.c
+ ../btif/src/btif_hl.c \
+ ../btif/src/btif_sock.c \
+ ../btif/src/btif_sock_rfc.c \
+ ../btif/src/btif_sock_thread.c \
+ ../btif/src/btif_sock_sdp.c \
+ ../btif/src/btif_sock_util.c
# callouts
LOCAL_SRC_FILES+= \
@@ -46,20 +51,20 @@ 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+= . \