* #35924 (zrtp): switch to libzrtpcpp
diff --git a/jni/libzrtp/Android.mk b/jni/libzrtp/Android.mk
index 045fc55..3f7d1ac 100644
--- a/jni/libzrtp/Android.mk
+++ b/jni/libzrtp/Android.mk
@@ -1,55 +1,32 @@
#
+# Copyright (c) 2013 Slient Circle LLC. All rights reserved.
+#
+# @author Werner Dittmann <Werner.Dittmann@t-online.de>
+#
+# ZRTP version: 4.0.0
+
+ROOT_SRC_PATH := $(LOCAL_PATH)/libzrtp/sources
+
+OLD_PATH = $(LOCAL_PATH)
+LOCAL_PATH = libzrtp/sources
+#
# Define and build the zrtpcpp static lib
#
include $(CLEAR_VARS)
-
-MY_LIBZRTPCPP = libzrtp
-
-LOCAL_MODULE := libzrtpcpp
+LOCAL_MODULE := zrtpcpp
LOCAL_CPP_FEATURES := exceptions
-#
-# set to false if testing/compiling new modules to catch undefined symbols (if build shared lib without TIVI_ENV)
-# LOCAL_ALLOW_UNDEFINED_SYMBOLS := true
# include paths for zrtpcpp modules
-LOCAL_C_INCLUDES += $(MY_LIBZRTPCPP) \
- $(MY_LIBZRTPCPP)/srtp \
- $(MY_LIBZRTPCPP)/src \
- $(APP_PROJECT_PATH)/jni/ucommon/inc \
- $(MY_LIBZRTPCPP)/src/libzrtpcpp \
- $(MY_OPENSSL)/include \
+LOCAL_C_INCLUDES += $(ROOT_SRC_PATH) $(ROOT_SRC_PATH)/srtp $(ROOT_SRC_PATH)/zrtp $(ROOT_SRC_PATH)/bnlib \
+ $(ROOT_SRC_PATH)/clients/tivi \
+ $(ROOT_SRC_PATH)/clients/ccrtp \
+ $(ROOT_SRC_PATH)/common
-LOCAL_SRC_FILES += \
- $(MY_LIBZRTPCPP)/src/ZrtpCallbackWrapper.cpp \
- $(MY_LIBZRTPCPP)/src/Zrtp.cpp \
- $(MY_LIBZRTPCPP)/src/ZrtpCrc32.cpp \
- $(MY_LIBZRTPCPP)/src/ZrtpPacketCommit.cpp \
- $(MY_LIBZRTPCPP)/src/ZrtpPacketConf2Ack.cpp \
- $(MY_LIBZRTPCPP)/src/ZrtpPacketConfirm.cpp \
- $(MY_LIBZRTPCPP)/src/ZrtpPacketDHPart.cpp \
- $(MY_LIBZRTPCPP)/src/ZrtpPacketGoClear.cpp \
- $(MY_LIBZRTPCPP)/src/ZrtpPacketClearAck.cpp \
- $(MY_LIBZRTPCPP)/src/ZrtpPacketHelloAck.cpp \
- $(MY_LIBZRTPCPP)/src/ZrtpPacketHello.cpp \
- $(MY_LIBZRTPCPP)/src/ZrtpPacketError.cpp \
- $(MY_LIBZRTPCPP)/src/ZrtpPacketErrorAck.cpp \
- $(MY_LIBZRTPCPP)/src/ZrtpPacketPingAck.cpp \
- $(MY_LIBZRTPCPP)/src/ZrtpPacketPing.cpp \
- $(MY_LIBZRTPCPP)/src/ZrtpPacketSASrelay.cpp \
- $(MY_LIBZRTPCPP)/src/ZrtpPacketRelayAck.cpp \
- $(MY_LIBZRTPCPP)/src/ZrtpStateClass.cpp \
- $(MY_LIBZRTPCPP)/src/ZrtpTextData.cpp \
- $(MY_LIBZRTPCPP)/src/ZrtpConfigure.cpp \
- $(MY_LIBZRTPCPP)/src/ZrtpCWrapper.cpp \
- $(MY_LIBZRTPCPP)/src/Base32.cpp \
- $(MY_LIBZRTPCPP)/srtp/CryptoContext.cpp \
- $(MY_LIBZRTPCPP)/srtp/CryptoContextCtrl.cpp \
- $(MY_LIBZRTPCPP)/srtp/crypto/openssl/hmac.cpp \
- $(MY_LIBZRTPCPP)/srtp/crypto/openssl/SrtpSymCrypto.cpp \
- $(MY_LIBZRTPCPP)/srtp/crypto/skein_block.c \
- $(MY_LIBZRTPCPP)/srtp/crypto/macSkein.cpp \
- $(MY_LIBZRTPCPP)/srtp/crypto/skein.c \
+LOCAL_CFLAGS := -DSUPPORT_NON_NIST
+LOCAL_SRC_FILES += buildinfo_$(TARGET_ARCH_ABI).c
+LOCAL_SRC_FILES += zrtp/ZrtpCallbackWrapper.cpp zrtp/ZRtp.cpp zrtp/ZrtpCrc32.cpp zrtp/ZrtpPacketCommit.cpp zrtp/ZrtpPacketConf2Ack.cpp zrtp/ZrtpPacketConfirm.cpp zrtp/ZrtpPacketDHPart.cpp zrtp/ZrtpPacketGoClear.cpp zrtp/ZrtpPacketClearAck.cpp zrtp/ZrtpPacketHelloAck.cpp zrtp/ZrtpPacketHello.cpp zrtp/ZrtpPacketError.cpp zrtp/ZrtpPacketErrorAck.cpp zrtp/ZrtpPacketPingAck.cpp zrtp/ZrtpPacketPing.cpp zrtp/ZrtpPacketSASrelay.cpp zrtp/ZrtpPacketRelayAck.cpp zrtp/ZrtpStateClass.cpp zrtp/ZrtpTextData.cpp zrtp/ZrtpConfigure.cpp zrtp/ZrtpCWrapper.cpp zrtp/Base32.cpp zrtp/zrtpB64Encode.c zrtp/zrtpB64Decode.c common/osSpecifics.c zrtp/ZrtpSdesStream.cpp zrtp/ZIDCacheDb.cpp zrtp/ZIDRecordDb.cpp zrtp/zrtpCacheSqliteBackend.c clients/tivi/CtZrtpSession.cpp clients/tivi/CtZrtpStream.cpp common/Thread.cpp common/MutexClass.cpp common/EventClass.cpp zrtp/crypto/zrtpDH.cpp zrtp/crypto/hmac256.cpp zrtp/crypto/sha256.cpp zrtp/crypto/hmac384.cpp zrtp/crypto/sha384.cpp zrtp/crypto/aesCFB.cpp zrtp/crypto/twoCFB.cpp zrtp/crypto/sha2.c zrtp/crypto/skeinMac256.cpp zrtp/crypto/skein256.cpp zrtp/crypto/skeinMac384.cpp zrtp/crypto/skein384.cpp srtp/CryptoContext.cpp srtp/CryptoContextCtrl.cpp srtp/SrtpHandler.cpp srtp/crypto/hmac.cpp srtp/crypto/SrtpSymCrypto.cpp srtp/crypto/sha1.c cryptcommon/twofish.c cryptcommon/twofish_cfb.c cryptcommon/aescrypt.c cryptcommon/aeskey.c cryptcommon/aestab.c cryptcommon/aes_modes.c cryptcommon/macSkein.cpp cryptcommon/skein.c cryptcommon/skein_block.c cryptcommon/skeinApi.c cryptcommon/ZrtpRandom.cpp
include $(BUILD_STATIC_LIBRARY)
+LOCAL_PATH = $(ROOT_SRC_PATH)/../..