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

update belle-sip and linphone:

Browse source 
- set proper belle-sip version
- fix zrtp compilation
- bugfixes
This commit is contained in:
Simon Morlat 2013-09-09 12:49:30 +02:00
parent 5cc5275648
commit 17b6009d53
4 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Makefile
View file

@ -6,6 +6,7 @@ TOPDIR=$(shell pwd)
PATCH_FFMPEG=$(shell cd submodules/externals/ffmpeg && git status | grep neon)
LINPHONE_VERSION=$(shell cd submodules/linphone && git describe --always)
LINPHONE_ANDROID_DEBUG_VERSION=$(shell git describe --always)
BELLESIP_VERSION=$(shell cat submodules/belle-sip/VERSION)
ANDROID_MOST_RECENT_TARGET=$(shell android list target -c | grep android | tail -n1)
SQLITE_VERSION=3071700
SQLITE_BASENAME=sqlite-amalgamation-$(SQLITE_VERSION)
@ -17,7 +18,7 @@ BUILD_REMOTE_PROVISIONING=1
BUILD_X264=0
BUILD_AMRNB=full # 0, light or full
BUILD_AMRWB=0
BUILD_GPLV3_ZRTP=1
BUILD_GPLV3_ZRTP=0
BUILD_SILK=1
BUILD_G729=0
BUILD_TUNNEL=0
@ -161,7 +162,11 @@ $(SQLITE_BASENAME).zip:
#Build targets
prepare-sources: prepare-ffmpeg prepare-ilbc prepare-vpx prepare-silk prepare-srtp prepare-mediastreamer2 prepare-antlr3 prepare-belle-sip $(TOPDIR)/res/raw/rootca.pem prepare-sqlite3
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) BUILD_SQLITE=$(BUILD_SQLITE)
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) BUILD_SQLITE=$(BUILD_SQLITE) \
BELLESIP_VERSION=$(BELLESIP_VERSION)
generate-libs: prepare-sources javah
$(NDK_PATH)/ndk-build $(LIBLINPHONE_OPTIONS) -j$(NUMCPUS)

2
submodules/belle-sip

@ -1 +1 @@
Subproject commit 491ba6f26fb44cea03f5e9632dd220db1691f97f
Subproject commit 84a603dbb01785e44dbc9cd69b78208c9d21cbf4

4
submodules/externals/build/libzrtpcpp/Android.mk vendored
View file

@ -68,10 +68,10 @@ LOCAL_C_INCLUDES += \
# Build dynamic and static versions
ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
LOCAL_MODULE:= libzrtpcpp
LOCAL_SHARED_LIBRARIES := liblincrypto liblinssl
LOCAL_SHARED_LIBRARIES := liblinssl liblincrypto
include $(BUILD_SHARED_LIBRARY)
else
LOCAL_STATIC_LIBRARIES := libcrypto-static libssl-static
LOCAL_STATIC_LIBRARIES := libssl-static libcrypto-static
LOCAL_MODULE:= libzrtpcpp-static
include $(BUILD_STATIC_LIBRARY)
endif

2
submodules/linphone

@ -1 +1 @@
Subproject commit 9e9be3e05f6972d519ed144bfd246944ff078492
Subproject commit 746b521cde009f08cc43fbc03a91fca2fd01ac94