From d150294716d0011c99347698db7eebef3fc57791 Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Thu, 28 Mar 2013 17:19:11 +0100
Subject: [PATCH] integrate polarssl to linphone-android. update srtp,
 necessary to avoid symbol conflict.

---
 .gitmodules                                   |  3 +
 jni/Android.mk                                |  2 +-
 jni/Application.mk                            |  2 +-
 submodules/belle-sip                          |  2 +-
 .../externals/build/polarssl/Android.mk       | 60 +++++++++++++++++++
 submodules/externals/polarssl                 |  1 +
 submodules/externals/srtp                     |  2 +-
 submodules/linphone                           |  2 +-
 8 files changed, 69 insertions(+), 5 deletions(-)
 create mode 100644 submodules/externals/build/polarssl/Android.mk
 create mode 160000 submodules/externals/polarssl

diff --git a/.gitmodules b/.gitmodules
index 1704828bf..8cd4d8c7b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -70,3 +70,6 @@
 [submodule "submodules/externals/axmlrpc"]
 	path = submodules/externals/axmlrpc
 	url = git://git.linphone.org/axmlrpc.git
+[submodule "submodules/externals/polarssl"]
+	path = submodules/externals/polarssl
+	url = git://github.com/polarssl/polarssl.git
diff --git a/jni/Android.mk b/jni/Android.mk
index 45268eda7..ab967d36b 100755
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -60,7 +60,7 @@ else
 include $(linphone-root-dir)/submodules/externals/prebuilts/gsm.mk
 endif
 
-
+include $(linphone-root-dir)/submodules/externals/build/polarssl/Android.mk
 include $(linphone-root-dir)/submodules/externals/build/antlr3/Android.mk
 include $(linphone-root-dir)/submodules/belle-sip/build/android/Android.mk
 
diff --git a/jni/Application.mk b/jni/Application.mk
index d454f17c3..8c6ee8acc 100644
--- a/jni/Application.mk
+++ b/jni/Application.mk
@@ -1,5 +1,5 @@
 APP_PROJECT_PATH := $(call my-dir)/../
-APP_MODULES      :=libspeex libgsm libortp antlr3 libbellesip libmediastreamer2 liblinphone liblinphonenoneon libneon
+APP_MODULES      :=libspeex libgsm libortp polarssl antlr3 libbellesip libmediastreamer2 liblinphone liblinphonenoneon libneon
 APP_STL := stlport_static
 
 #uPnp
diff --git a/submodules/belle-sip b/submodules/belle-sip
index 2e7d9876c..4da27241a 160000
--- a/submodules/belle-sip
+++ b/submodules/belle-sip
@@ -1 +1 @@
-Subproject commit 2e7d9876c076edd425827694162020ad2f7ad21f
+Subproject commit 4da27241ab8f0ce9a40949326540ee3ae6854b3d
diff --git a/submodules/externals/build/polarssl/Android.mk b/submodules/externals/build/polarssl/Android.mk
new file mode 100644
index 000000000..c3d48a556
--- /dev/null
+++ b/submodules/externals/build/polarssl/Android.mk
@@ -0,0 +1,60 @@
+
+LOCAL_PATH:= $(call my-dir)/../../polarssl/library
+include $(CLEAR_VARS)
+
+LOCAL_MODULE:= libpolarssl
+
+LOCAL_SRC_FILES := \
+		aes.c \
+		arc4.c \
+		asn1parse.c \
+		asn1write.c \
+		base64.c \
+		bignum.c \
+		blowfish.c \
+		camellia.c \
+		certs.c \
+		cipher.c \
+		cipher_wrap.c \
+		ctr_drbg.c  \
+		debug.c \
+		des.c \
+		dhm.c \
+		entropy.c \
+		entropy_poll.c \
+		error.c \
+		gcm.c \
+		havege.c \
+		md2.c \
+		md4.c \
+		md5.c \
+		md.c \
+		md_wrap.c \
+		net.c \
+		padlock.c \
+		pbkdf2.c \
+		pem.c \
+		pkcs11.c \
+		rsa.c \
+		sha1.c \
+		sha2.c \
+		sha4.c \
+		ssl_cache.c \
+		ssl_cli.c \
+		ssl_srv.c \
+		ssl_tls.c \
+		timing.c \
+		version.c \
+		x509parse.c \
+		x509write.c \
+		xtea.c
+
+
+
+#LOCAL_CFLAGS += \
+
+LOCAL_C_INCLUDES += \
+	$(LOCAL_PATH)/../include
+
+include $(BUILD_STATIC_LIBRARY)
+
diff --git a/submodules/externals/polarssl b/submodules/externals/polarssl
new file mode 160000
index 000000000..90f042d4c
--- /dev/null
+++ b/submodules/externals/polarssl
@@ -0,0 +1 @@
+Subproject commit 90f042d4cbdcbf398f347d5f7eef608cc11de5b5
diff --git a/submodules/externals/srtp b/submodules/externals/srtp
index c01a03a47..14027d37c 160000
--- a/submodules/externals/srtp
+++ b/submodules/externals/srtp
@@ -1 +1 @@
-Subproject commit c01a03a478d4c97fa7e2af80844f8d60440af0a6
+Subproject commit 14027d37c7574b27bf22e57f508137b4e86b6466
diff --git a/submodules/linphone b/submodules/linphone
index 2fede18b1..e69170d3f 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 2fede18b16402eec3779599b46e21d742d85ee02
+Subproject commit e69170d3f3983670c2f6a6e61be85e70ff298c2f