android: enable srtp

diff --git a/build/android/Android.mk b/build/android/Android.mk
index 299442e287e2bab161d0b72c43ee89c350b21a53..a7b9e024b3f515640f1a01d37169f51b47824e46 100755 (executable)
--- a/build/android/Android.mk
+++ b/build/android/Android.mk
@@ -119,6 +119,9 @@ endif
 
 LOCAL_STATIC_LIBRARIES += libspeex 
 
+ifeq ($(BUILD_SRTP), 1)
+       LOCAL_C_INCLUDES += $(SRTP_C_INCLUDE)
+endif
 
 ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
 LOCAL_CFLAGS += -DHAVE_ILBC=1

diff --git a/mediastreamer2 b/mediastreamer2
index 481d921f343086a8e634cd5b7241363c4f07b5fa..be3a6f4e357fbf664bcb44f954d8b9f76a069d1c 160000 (submodule)
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 481d921f343086a8e634cd5b7241363c4f07b5fa
+Subproject commit be3a6f4e357fbf664bcb44f954d8b9f76a069d1c

diff --git a/oRTP b/oRTP
index 13450079c956cac404f9c8f19bc1132f73cfca79..f78246fcce4faa1865d005a3532f878b1bf264cc 160000 (submodule)
--- a/oRTP
+++ b/oRTP
@@ -1 +1 @@
-Subproject commit 13450079c956cac404f9c8f19bc1132f73cfca79
+Subproject commit f78246fcce4faa1865d005a3532f878b1bf264cc