From 0c5a1885dfd767a5f494640f20620238d329b77e Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Tue, 21 Feb 2012 12:46:14 +0100 Subject: [PATCH] re enable srtp build by default --- jni/Android.mk | 5 +---- jni/Application.mk | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/jni/Android.mk b/jni/Android.mk index b6787c761..b55653673 100755 --- a/jni/Android.mk +++ b/jni/Android.mk @@ -7,13 +7,10 @@ endif ifeq ($(BUILD_AMRWB),) BUILD_AMRWB=0 endif -ifeq ($(BUILD_AMRWB),) -BUILD_AMRWB=0 -endif ifeq ($(BUILD_G729),) BUILD_G729=0 endif - +BUILD_SRTP=1 ifeq ($(TARGET_ARCH_ABI),armeabi-v7a) BUILD_X264=1 LINPHONE_VIDEO=1 diff --git a/jni/Application.mk b/jni/Application.mk index 63d92357c..95a3fa7b5 100644 --- a/jni/Application.mk +++ b/jni/Application.mk @@ -9,7 +9,7 @@ endif ifeq ($(BUILD_AMRWB),) BUILD_AMRWB=0 endif -ifeq ($(BUILD_AMRWB),) +ifeq ($(BUILD_SRTP),) BUILD_SRTP=1 endif