summaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorKim Schulz <k.schulz@samsung.com>2015-03-25 10:39:40 +0100
committerAndre Eisenbach <eisenbach@google.com>2015-04-10 16:49:17 -0700
commit8372aa5fa535ee4f09c09981b6125b54ace31fe2 (patch)
tree7dcba062c3e78e4475cd925706fc08201444118d /main
parentfd422a772fb3d28d462a2b8020ff4a2bdc5e954a (diff)
downloadandroid_system_bt-8372aa5fa535ee4f09c09981b6125b54ace31fe2.tar.gz
android_system_bt-8372aa5fa535ee4f09c09981b6125b54ace31fe2.tar.bz2
android_system_bt-8372aa5fa535ee4f09c09981b6125b54ace31fe2.zip
L2CAP and SDP Search API for BT profiles (2/2)
Added support for exposing L2CAP to Java such that OBEX over L2CAP is made possible. Added support to create SDP records as a seperate step.(as opposed to creating a SDP record when a BluetoothSocket is created). This allows both a RFCOMM channel and a L2CAP PSM to be included in a SDP record. (Additionally the content of the SDP record is set by the profile in Java, in stead of beeing hardcoded in the socket layer.) This completes the L2CAP channel exposure to Java. Change-Id: Iaf68a07d910145cdd33e940d73cd680f79164100
Diffstat (limited to 'main')
-rw-r--r--main/Android.mk4
1 files changed, 3 insertions, 1 deletions
diff --git a/main/Android.mk b/main/Android.mk
index ffb2fefaa..d0c4956a4 100644
--- a/main/Android.mk
+++ b/main/Android.mk
@@ -35,7 +35,7 @@ LOCAL_SRC_FILES += \
../btif/src/btif_hf_client.c \
../btif/src/btif_hh.c \
../btif/src/btif_hl.c \
- ../btif/src/btif_mce.c \
+ ../btif/src/btif_sdp.c \
../btif/src/btif_media_task.c \
../btif/src/btif_pan.c \
../btif/src/btif_profile_queue.c \
@@ -43,9 +43,11 @@ LOCAL_SRC_FILES += \
../btif/src/btif_sm.c \
../btif/src/btif_sock.c \
../btif/src/btif_sock_rfc.c \
+ ../btif/src/btif_sock_l2cap.c \
../btif/src/btif_sock_sco.c \
../btif/src/btif_sock_sdp.c \
../btif/src/btif_sock_thread.c \
+ ../btif/src/btif_sdp_server.c \
../btif/src/btif_sock_util.c \
../btif/src/btif_storage.c \
../btif/src/btif_util.c \