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

add build option to disable polarssl

Browse source
This commit is contained in:
Jehan Monnier 2013-04-02 09:18:25 +02:00
parent 1d8f202c5a
commit 9cf7c52213
4 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Makefile
View file

@ -22,6 +22,7 @@ BUILD_WEBRTC_AECM=1
BUILD_FOR_X86=1
USE_JAVAH=1
LINPHONE_VIDEO=1
BUILD_TLS=1
# Checks
CHECK_MSG=$(shell ./check_tools.sh)
@ -119,7 +120,7 @@ prepare-liblinphone_tester: $(TOPDIR)/submodules/linphone/tester/*_lrc $(TOPDIR)
prepare-sources: prepare-ffmpeg prepare-ilbc prepare-vpx prepare-silk prepare-srtp prepare-mediastreamer2 prepare-antlr3 prepare-belle-sip
LIBLINPHONE_OPTIONS = NDK_DEBUG=$(NDK_DEBUG) LINPHONE_VERSION=$(LINPHONE_VERSION) BUILD_UPNP=$(BUILD_UPNP) BUILD_REMOTE_PROVISIONING=$(BUILD_REMOTE_PROVISIONING) BUILD_X264=$(BUILD_X264) BUILD_AMRNB=$(BUILD_AMRNB) BUILD_AMRWB=$(BUILD_AMRWB) BUILD_GPLV3_ZRTP=$(BUILD_GPLV3_ZRTP) BUILD_SILK=$(BUILD_SILK) BUILD_G729=$(BUILD_G729) BUILD_TUNNEL=$(BUILD_TUNNEL) BUILD_WEBRTC_AECM=$(BUILD_WEBRTC_AECM) BUILD_FOR_X86=$(BUILD_FOR_X86) USE_JAVAH=$(USE_JAVAH)
LIBLINPHONE_OPTIONS = NDK_DEBUG=$(NDK_DEBUG) LINPHONE_VERSION=$(LINPHONE_VERSION) BUILD_UPNP=$(BUILD_UPNP) BUILD_REMOTE_PROVISIONING=$(BUILD_REMOTE_PROVISIONING) BUILD_X264=$(BUILD_X264) BUILD_AMRNB=$(BUILD_AMRNB) BUILD_AMRWB=$(BUILD_AMRWB) BUILD_GPLV3_ZRTP=$(BUILD_GPLV3_ZRTP) BUILD_SILK=$(BUILD_SILK) BUILD_G729=$(BUILD_G729) BUILD_TUNNEL=$(BUILD_TUNNEL) BUILD_WEBRTC_AECM=$(BUILD_WEBRTC_AECM) BUILD_FOR_X86=$(BUILD_FOR_X86) USE_JAVAH=$(USE_JAVAH) BUILD_TLS=$(BUILD_TLS)
generate-libs: prepare-sources javah
$(NDK_PATH)/ndk-build $(LIBLINPHONE_OPTIONS) -j$(NUMCPUS)

6
jni/Application.mk
View file

@ -1,5 +1,5 @@
APP_PROJECT_PATH := $(call my-dir)/../
APP_MODULES :=libspeex libgsm libortp polarssl antlr3 libbellesip libmediastreamer2 liblinphone liblinphonenoneon libneon
APP_MODULES :=libspeex libgsm libortp antlr3 libbellesip libmediastreamer2 liblinphone liblinphonenoneon libneon
APP_STL := stlport_static
#uPnp
@ -7,6 +7,10 @@ ifeq ($(BUILD_UPNP),1)
APP_MODULES += libupnp
endif
ifeq ($(BUILD_TLS),1)
APP_MODULES +=polarssl
endif
#remote provisioning
ifeq ($(BUILD_REMOTE_PROVISIONING),1)
APP_MODULES += libxml2 libxml2lpc liblpc2xml

2
submodules/belle-sip

@ -1 +1 @@
Subproject commit e7852469a6c204183f01639ab91e20fa8f50e773
Subproject commit f444e2f56a78b0674ad237a1a5f7dfb7d020c1e4

2
submodules/linphone

@ -1 +1 @@
Subproject commit 6ac44d6628bc258021c1526f39ee71f53061179e
Subproject commit cea2676afe046ed9017675222b0273124f1d648f