Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/bctoolbox'

Browse source 
Conflicts:
	submodules/belle-sip
	submodules/linphone
This commit is contained in:
Simon Morlat 2016-02-17 11:54:04 +01:00
commit bb2714a303
7 changed files with 22 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.gitmodules vendored
View file

@ -85,3 +85,9 @@
[submodule "submodules/mscodec2"]
path = submodules/mscodec2
url = git://git.linphone.org/mscodec2.git
[submodule "submodules/bctoolbox"]
path = submodules/bctoolbox
url = git://git.linphone.org/bctoolbox.git
[submodule "submodules/externals/mbedtls"]
path = submodules/externals/mbedtls
url = https://github.com/ARMmbed/mbedtls.git

1
Makefile
View file

@ -61,6 +61,7 @@ BUILD_RTP_MAP=0
BUILD_DONT_CHECK_HEADERS_IN_MESSAGE=0
BUILD_ILBC=1
BUILD_CODEC2=0
BUILD_BCTOOLBOX_MBEDTLS=0
LIBLINPHONE_EXTENDED_SRC_FILES=
LIBLINPHONE_EXTENDED_C_INCLUDES=
LIBLINPHONE_EXTENDED_CFLAGS=

7
jni/Android.mk
View file

@ -57,7 +57,14 @@ ifeq ($(BUILD_MATROSKA), 1)
include $(linphone-root-dir)/submodules/externals/build/libmatroska-c/Android.mk
endif
ifeq ($(BUILD_BCTOOLBOX_MBEDTLS),1)
include $(linphone-root-dir)/submodules/externals/build/mbedtls/Android.mk
include $(linphone-root-dir)/submodules/bctoolbox/build/android/Android-mbedtls.mk
else
include $(linphone-root-dir)/submodules/externals/build/polarssl/Android.mk
include $(linphone-root-dir)/submodules/bctoolbox/build/android/Android-polarssl.mk
endif
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

5
jni/Application.mk
View file

@ -55,10 +55,15 @@ ifeq ($(BUILD_UPNP),1)
APP_MODULES += libupnp
endif
APP_MODULES +=bctoolbox
ifeq ($(BUILD_TLS),1)
ifeq ($(BUILD_BCTOOLBOX_MBEDTLS),1)
APP_MODULES +=mbedtls
else
APP_MODULES +=polarssl
endif
endif
endif
ifeq ($(BUILD_VIDEO),1)
APP_MODULES += libffmpeg-linphone

1
submodules/bctoolbox Submodule

@ -0,0 +1 @@
Subproject commit f0080ffcb26883b664bc785abff15a6698dee0c3

1
submodules/externals/mbedtls vendored Submodule

@ -0,0 +1 @@
Subproject commit bfafadb45daf8d2114e3109e2f9021fc72ee36bb

2
submodules/linphone

@ -1 +1 @@
Subproject commit 2c929a08c71950a0dab0ab1b97c574d575d3452f
Subproject commit 523cbd2febdaaa8e6662a5bf1708ab7fba451a70