From 405dbd617ffb50ab254219e21ec66b5cd91e69f6 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Mon, 18 Nov 2013 22:28:43 +0100 Subject: [PATCH] update belle-sip and linphone: allow raw data to be used in LinphoneContent --- jni/Android.mk | 2 +- project.properties | 2 +- submodules/belle-sip | 2 +- submodules/linphone | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/jni/Android.mk b/jni/Android.mk index 93612c289..aab6873ff 100755 --- a/jni/Android.mk +++ b/jni/Android.mk @@ -168,7 +168,7 @@ ifneq ($(BUILD_WEBRTC_ISAC),0) WEBRTC_BUILD_NEON_LIBS=true endif - $(info $(TARGET_ARCH_ABI): Build proprietary iSAC plugin for mediastreamer2) + $(info $(TARGET_ARCH_ABI): Build iSAC plugin for mediastreamer2) include $(linphone-root-dir)/submodules/externals/build/webrtc/modules/audio_coding/codecs/isac/fix/source/Android.mk include $(linphone-root-dir)/submodules/msisac/Android.mk endif diff --git a/project.properties b/project.properties index a2bff5858..019cc5583 100644 --- a/project.properties +++ b/project.properties @@ -11,5 +11,5 @@ #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt # Project target. -target=android-18 +target=android-17 android.library=false diff --git a/submodules/belle-sip b/submodules/belle-sip index 3d37b480e..13774a023 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit 3d37b480eb8219d64306a8d16ca1c581a946f18e +Subproject commit 13774a023ec843945b87652eb4e3781669add838 diff --git a/submodules/linphone b/submodules/linphone index 244edb9b7..2f415bc61 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 244edb9b71a5061f2d65eecd73c55bb48355710f +Subproject commit 2f415bc619c758155b77aef31f0d3392717c7496