From e42a8d15c07222544ac1078eb4ac15a8da31a2a0 Mon Sep 17 00:00:00 2001 From: Johan Pascal <johan.pascal@belledonne-communications.com> Date: Mon, 31 Mar 2014 12:02:19 +0200 Subject: [PATCH] Update Makefile and oRTP to switch to bzrtp --- build/android/Android.mk | 2 +- oRTP | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/android/Android.mk b/build/android/Android.mk index 47098be791..f009cf2952 100755 --- a/build/android/Android.mk +++ b/build/android/Android.mk @@ -201,7 +201,7 @@ LOCAL_CFLAGS += $(LIBLINPHONE_EXTENDED_CFLAGS) ifeq ($(BUILD_GPLV3_ZRTP),1) LOCAL_SHARED_LIBRARIES += libssl-linphone libcrypto-linphone - LOCAL_SHARED_LIBRARIES += libzrtpcpp + LOCAL_SHARED_LIBRARIES += libbzrtp endif ifeq ($(BUILD_SRTP),1) diff --git a/oRTP b/oRTP index b2e5f313e6..d3a18ddcf2 160000 --- a/oRTP +++ b/oRTP @@ -1 +1 @@ -Subproject commit b2e5f313e6f245588751835ccd01bcd5dc2e8b1e +Subproject commit d3a18ddcf22f20480c7a1d9e38819e375d3c4d05 -- GitLab