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

re-enable zrtp

Browse source
This commit is contained in:
Jehan Monnier 2014-01-14 16:19:17 +01:00
parent 4bb4af2aea
commit fb5343d8ba
5 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Makefile
View file

@ -35,13 +35,13 @@ ENABLE_GPL_THIRD_PARTIES=1
ifeq ($(ENABLE_GPL_THIRD_PARTIES),1) ifeq ($(ENABLE_GPL_THIRD_PARTIES),1)
BUILD_X264=1 BUILD_X264=1
BUILD_G729=1 BUILD_G729=1
BUILD_ZRTP=1 BUILD_GPLV3_ZRTP=1
else else
#x264 and g729 requires additional licensing agreements. #x264 and g729 requires additional licensing agreements.
BUILD_X264=0 BUILD_X264=0
BUILD_G729=0 BUILD_G729=0
#zrtpcpp is GPL. #zrtpcpp is GPL.
BUILD_ZRTP=0 BUILD_GPLV3_ZRTP=0
endif endif
NDK_DEBUG=0 NDK_DEBUG=0
@ -252,7 +252,7 @@ endif
# @cd $(TOPDIR)/submodules/externals/libzrtpcpp/ && \ # @cd $(TOPDIR)/submodules/externals/libzrtpcpp/ && \
# cp ../build/libzrtpcpp/libzrtpcpp-config.h . \ # cp ../build/libzrtpcpp/libzrtpcpp-config.h . \
|| ( echo "ZRTP prepare state failed." ; exit 1 ) || ( echo "ZRTP prepare state failed." ; exit 1 )
#ifeq ($(BUILD_ZRTP), 1) #ifeq ($(BUILD_GPLV3_ZRTP), 1)
#prepare-zrtp: $(TOPDIR)/submodules/externals/libzrtpcpp/libzrtpcpp-config.h #prepare-zrtp: $(TOPDIR)/submodules/externals/libzrtpcpp/libzrtpcpp-config.h
#else #else
prepare-zrtp: prepare-zrtp:
@ -334,7 +334,7 @@ prepare-sources: build-ffmpeg build-x264 prepare-ilbc build-vpx prepare-silk pre
GENERATE_OPTIONS = NDK_DEBUG=$(NDK_DEBUG) BUILD_FOR_X86=$(BUILD_FOR_X86) \ GENERATE_OPTIONS = NDK_DEBUG=$(NDK_DEBUG) BUILD_FOR_X86=$(BUILD_FOR_X86) \
BUILD_AMRNB=$(BUILD_AMRNB) BUILD_AMRWB=$(BUILD_AMRWB) BUILD_SILK=$(BUILD_SILK) BUILD_G729=$(BUILD_G729) BUILD_OPUS=$(BUILD_OPUS) \ BUILD_AMRNB=$(BUILD_AMRNB) BUILD_AMRWB=$(BUILD_AMRWB) BUILD_SILK=$(BUILD_SILK) BUILD_G729=$(BUILD_G729) BUILD_OPUS=$(BUILD_OPUS) \
BUILD_VIDEO=$(BUILD_VIDEO) BUILD_X264=$(BUILD_X264) \ BUILD_VIDEO=$(BUILD_VIDEO) BUILD_X264=$(BUILD_X264) \
BUILD_UPNP=$(BUILD_UPNP) BUILD_ZRTP=$(BUILD_ZRTP) BUILD_WEBRTC_AECM=$(BUILD_WEBRTC_AECM) BUILD_WEBRTC_ISAC=$(BUILD_WEBRTC_ISAC) BUILD_UPNP=$(BUILD_UPNP) BUILD_GPLV3_ZRTP=$(BUILD_GPLV3_ZRTP) BUILD_WEBRTC_AECM=$(BUILD_WEBRTC_AECM) BUILD_WEBRTC_ISAC=$(BUILD_WEBRTC_ISAC)
LIBLINPHONE_OPTIONS = $(GENERATE_OPTIONS) \ LIBLINPHONE_OPTIONS = $(GENERATE_OPTIONS) \

4
jni/Android.mk
View file

@ -17,7 +17,7 @@ endif
endif endif
ifeq ($(BUILD_ZRTP), 1) ifeq ($(BUILD_GPLV3_ZRTP), 1)
BUILD_SRTP=1 BUILD_SRTP=1
ZRTP_C_INCLUDE= \ ZRTP_C_INCLUDE= \
$(linphone-root-dir)/submodules/externals/libzrtpcpp/zrtp \ $(linphone-root-dir)/submodules/externals/libzrtpcpp/zrtp \
@ -95,7 +95,7 @@ include $(linphone-root-dir)/submodules/externals/build/libvpx/Android.mk
endif #_BUILD_VIDEO endif #_BUILD_VIDEO
ifeq ($(BUILD_ZRTP), 1) ifeq ($(BUILD_GPLV3_ZRTP), 1)
ifeq (,$(DUMP_VAR)) ifeq (,$(DUMP_VAR))
$(info $(TARGET_ARCH_ABI): Build ZRTP support) $(info $(TARGET_ARCH_ABI): Build ZRTP support)
endif endif

2
jni/Application.mk
View file

@ -114,7 +114,7 @@ APP_MODULES += libtunnelclient
endif endif
endif endif
ifeq ($(BUILD_ZRTP), 1) ifeq ($(BUILD_GPLV3_ZRTP), 1)
APP_MODULES += libzrtpcpp APP_MODULES += libzrtpcpp
endif endif

2
project.properties
View file

@ -11,5 +11,5 @@
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
# Project target. # Project target.
target=android-17 target=android-18
android.library=false android.library=false

2
submodules/linphone

@ -1 +1 @@
Subproject commit c2ca9f8c089b1b6ed8e7bc1f2bfa8d5a5defc524 Subproject commit f0250b5a5fb9cb6a2bbf0432f7b4bb352189dafe