From 099a15ed79998387734608eb56678541fdadf415 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Tue, 8 Mar 2016 11:43:15 +0100 Subject: [PATCH] fix liblinphone_tester build --- jni/Android.mk | 2 ++ jni/Application.mk | 2 +- submodules/bctoolbox | 2 +- submodules/belle-sip | 2 +- submodules/linphone | 2 +- 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/jni/Android.mk b/jni/Android.mk index 2ba8b6253..256939495 100755 --- a/jni/Android.mk +++ b/jni/Android.mk @@ -65,6 +65,8 @@ include $(linphone-root-dir)/submodules/externals/build/polarssl/Android.mk include $(linphone-root-dir)/submodules/bctoolbox/build/android/Android-polarssl.mk endif +include $(linphone-root-dir)/submodules/bctoolbox/build/android/Android-tester.mk + ifeq ($(BUILD_MEDIASTREAMER2_SDK), 0) include $(linphone-root-dir)/submodules/externals/build/antlr3/Android.mk include $(linphone-root-dir)/submodules/belle-sip/build/android/Android.mk diff --git a/jni/Application.mk b/jni/Application.mk index 8650c929e..5119f4c76 100644 --- a/jni/Application.mk +++ b/jni/Application.mk @@ -55,7 +55,7 @@ ifeq ($(BUILD_UPNP),1) APP_MODULES += libupnp endif -APP_MODULES +=bctoolbox +APP_MODULES +=bctoolbox bctoolbox_tester ifeq ($(BUILD_TLS),1) ifeq ($(BUILD_BCTOOLBOX_MBEDTLS),1) APP_MODULES +=mbedtls diff --git a/submodules/bctoolbox b/submodules/bctoolbox index ce02a6b35..790c34694 160000 --- a/submodules/bctoolbox +++ b/submodules/bctoolbox @@ -1 +1 @@ -Subproject commit ce02a6b350a59207742499fcf57da13ac70024dd +Subproject commit 790c34694d6dce8529008575b1da44b5eeffa122 diff --git a/submodules/belle-sip b/submodules/belle-sip index 54dbbd6f6..70a0e732a 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit 54dbbd6f6c52ec371359b45fd5b8b88a6a3b4763 +Subproject commit 70a0e732a40ed0c1cb5f164ad8bc2e5c963a3cac diff --git a/submodules/linphone b/submodules/linphone index 1811b9d01..a0a812063 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 1811b9d01ae341f3bec31b1fce115c0e0dd52869 +Subproject commit a0a8120635233181206d4f4de8dc4611cda393ae