Update ZRTPCPP to 2.3.4

Makefile

@@ -74,6 +74,15 @@ $(LIBMSSILK_BUILD_DIR)/sdk/SILK_SDK_SRC_v1.0.8/SILK_SDK_SRC_ARM_v1.0.8/src/SKP_S
 
 prepare-silk: $(LIBMSSILK_BUILD_DIR)/sdk/SILK_SDK_SRC_v1.0.8/SILK_SDK_SRC_ARM_v1.0.8/src/SKP_Silk_resampler.c
 
+#Zrtp
+$(TOPDIR)/submodules/externals/libzrtpcpp/libzrtpcpp-config.h : $(TOPDIR)/submodules/externals/build/libzrtpcpp/libzrtpcpp-config.h
+	@cd $(TOPDIR)/submodules/externals/libzrtpcpp/ && \
+	cp ../build/libzrtpcpp/libzrtpcpp-config.h . \
+	|| ( echo "ZRTP prepare state failed." ; exit 1 )
+prepare-zrtp: $(TOPDIR)/submodules/externals/libzrtpcpp/libzrtpcpp-config.h
+
+
+
 #srtp
 $(TOPDIR)/submodules/externals/srtp/config.h : $(TOPDIR)/submodules/externals/build/srtp/config.h
 	@cd $(TOPDIR)/submodules/externals/srtp/ && \
@@ -89,7 +98,7 @@ prepare-mediastreamer2:
 	if ! [ -e yuv2rgb.vs.h ]; then echo "yuv2rgb.vs.h creation error (do you have 'xxd' application installed ?)"; exit 1; fi && \
 	if ! [ -e yuv2rgb.fs.h ]; then echo "yuv2rgb.fs.h creation error (do you have 'xxd' application installed ?)"; exit 1; fi
 
-prepare-sources: prepare-ffmpeg prepare-ilbc prepare-vpx prepare-silk prepare-srtp prepare-mediastreamer2
+prepare-sources: prepare-ffmpeg prepare-ilbc prepare-vpx prepare-silk prepare-srtp prepare-zrtp prepare-mediastreamer2
 
 generate-libs:
 	$(NDK_PATH)/ndk-build $(NDK_BUILD_OPTIONS)

prepare_sources.sh

@@ -1,57 +0,0 @@
-#!/bin/sh
-
-topdir=`pwd`
-
-if test -z "$1" ; then
-	ndk_build_path=`which ndk-build`
-	if test "$?" != "0" ; then
-		echo "ndk-build not found in path. Please specify path to android NDK as first argument of $0."
-		exit 127
-	fi
-	NDK_PATH=`dirname $ndk_build_path`
-	if test -z "NDK_PATH" ; then
-		echo "Path to Android NDK not set, please specify it as first argument of $0."
-		exit 127
-	fi
-else
-	NDK_PATH=$1
-fi
-
-echo "using $NDK_PATH as android NDK"
-
-cd submodules/externals/ffmpeg
-if test -z "`git status | grep neon`" ; then
-	echo "Applying patch to ffmpeg"
-	cd $topdir
-	patch -p0 < ${topdir}/patches/ffmpeg_scalar_product_remove_alignment_hints.patch
-fi
-
-cd $topdir/submodules/libilbc-rfc3951 && ./autogen.sh && ./configure && make || ( echo "iLBC prepare stage failed" ; exit 1 )
-
-cd $topdir/submodules/externals/libvpx && ./configure --target=armv7-android-gcc --sdk-path=$NDK_PATH --enable-error-concealment && make clean && make asm_com_offsets.asm || ( echo "VP8 prepare stage failed." ; exit 1 )
-
-cd $topdir/submodules/mssilk && ./autogen.sh && ./configure --host=arm-linux MEDIASTREAMER_CFLAGS=" " MEDIASTREAMER_LIBS=" " && cd sdk && make extract-sources || ( echo "SILK audio plugin prepare state failed." ; exit 1 )
-
-cd $topdir/submodules/externals/srtp/ && cp ../build/srtp/config.h . || ( echo "SRTP prepare state failed." ; exit 1 )
-
-cd $topdir/submodules/linphone/mediastreamer2/src/
-# extract rules to build shader files
-vs_rule=`cat Makefile.am | grep xxd | grep yuv2rgb.vs | sed 's/$$builddir/./'`
-fs_rule=`cat Makefile.am | grep xxd | grep yuv2rgb.fs | sed 's/$$builddir/./'`
-eval $vs_rule
-# verify vs file creation
-if ! [ -e yuv2rgb.vs.h ]
-then
-	echo "yuv2rgb.vs.h creation error (do you have 'xxd' application installed ?)"; cd -; exit 1
-fi
-eval $fs_rule
-# verify fs file creation
-if ! [ -e yuv2rgb.fs.h ]
-then
-	echo "yuv2rgb.fs.h creation error (do you have 'xxd' application installed ?)"; cd -; exit 1
-fi
-cd $topdir
-
-# As a memo, the config.h for zrtpcpp is generated using the command
-# cmake  -Denable-ccrtp=false submodules/externals/libzrtpcpp
-

submodules/externals/build/libzrtpcpp/Android.mk

@@ -11,7 +11,7 @@ LOCAL_SRC_FILES := \
 	 	src/ZIDRecord.cpp \
 	 	src/ZrtpCallbackWrapper.cpp \
 	 	src/ZrtpConfigure.cpp \
-	 	src/ZRtp.cpp \
+	 	src/Zrtp.cpp \
 	 	src/ZrtpCrc32.cpp \
 	 	src/ZrtpCWrapper.cpp \
 	 	src/ZrtpPacketClearAck.cpp \

submodules/externals/libzrtpcpp

@@ -1 +1 @@
-Subproject commit 93dbdb3159f55bb35f69c13df1f60ac4901c88fb
+Subproject commit bfbfcab72dfa27862b05607d18bb24b6f8395fcf