From 9680b2915adcb22a1d14a7c2c7b691c49fa91a3a Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Thu, 3 Oct 2013 17:33:16 +0200
Subject: [PATCH] Use shared library arch ABI suffixes on Android.

---
 build/android/common.mk                       | 35 +++----------------
 .../core/LinphoneCoreFactoryImpl.java         | 10 +++---
 oRTP                                          |  2 +-
 3 files changed, 10 insertions(+), 37 deletions(-)

diff --git a/build/android/common.mk b/build/android/common.mk
index ee4832ea1..7e902c05e 100644
--- a/build/android/common.mk
+++ b/build/android/common.mk
@@ -184,40 +184,13 @@ LOCAL_C_INCLUDES += $(LIBLINPHONE_EXTENDED_C_INCLUDES)
 LOCAL_WHOLE_STATIC_LIBRARIES += $(LIBLINPHONE_EXTENDED_STATIC_LIBS)
 LOCAL_SRC_FILES  += $(LIBLINPHONE_EXTENDED_SRC_FILES)
 
-ifeq ($(TARGET_ARCH), arm)
-ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
-	ifeq ($(BUILD_GPLV3_ZRTP),1)
-		LOCAL_SHARED_LIBRARIES += liblinssl liblincrypto
-		LOCAL_SHARED_LIBRARIES += libzrtpcpp
-	endif
-
-	ifeq ($(BUILD_SRTP),1)
-	LOCAL_SHARED_LIBRARIES += libsrtp
-	endif
-else
-	LOCAL_LDLIBS += -lz
-	#LOCAL_STATIC_LIBRARIES += libz libdl
-	
-	ifeq ($(BUILD_GPLV3_ZRTP),1)
-		LOCAL_STATIC_LIBRARIES += libzrtpcpp-static
-		LOCAL_STATIC_LIBRARIES += \
-		libssl-static libcrypto-static
-	endif
-
-	ifeq ($(BUILD_SRTP),1)
-		LOCAL_STATIC_LIBRARIES += libsrtp-static
-	endif
+ifeq ($(BUILD_GPLV3_ZRTP),1)
+	LOCAL_SHARED_LIBRARIES += libssl-linphone libcrypto-linphone
+	LOCAL_SHARED_LIBRARIES += libzrtpcpp
 endif
-endif
-ifeq ($(TARGET_ARCH), x86)
-	ifeq ($(BUILD_GPLV3_ZRTP),1)
-		LOCAL_SHARED_LIBRARIES += liblinssl liblincrypto
-		LOCAL_SHARED_LIBRARIES += libzrtpcpp
-	endif
 
-	ifeq ($(BUILD_SRTP),1)
+ifeq ($(BUILD_SRTP),1)
 	LOCAL_SHARED_LIBRARIES += libsrtp
-	endif
 endif
 
 ifeq ($(BUILD_REMOTE_PROVISIONING),1)
diff --git a/java/impl/org/linphone/core/LinphoneCoreFactoryImpl.java b/java/impl/org/linphone/core/LinphoneCoreFactoryImpl.java
index 54032a2f6..4df1bd364 100644
--- a/java/impl/org/linphone/core/LinphoneCoreFactoryImpl.java
+++ b/java/impl/org/linphone/core/LinphoneCoreFactoryImpl.java
@@ -57,13 +57,13 @@ public class LinphoneCoreFactoryImpl extends LinphoneCoreFactory {
 		}
 
 		// OPENSSL (cryptography)
-		// lin prefix avoids collision with libs in /system/lib
-		loadOptionalLibrary("lincrypto");
-		loadOptionalLibrary("linssl");
+		// linphone suffix avoids collision with libs in /system/lib
+		loadOptionalLibrary("crypto-linphone-" + eabi);
+		loadOptionalLibrary("ssl-linphone-" + eabi);
 
 		// Secure RTP and key negotiation
-		loadOptionalLibrary("srtp");
-		loadOptionalLibrary("zrtpcpp"); // GPLv3+
+		loadOptionalLibrary("srtp-" + eabi);
+		loadOptionalLibrary("zrtpcpp" + eabi); // GPLv3+
 
 		// Tunnel
 		loadOptionalLibrary("tunnelclient");
diff --git a/oRTP b/oRTP
index 6b89540de..890e2306f 160000
--- a/oRTP
+++ b/oRTP
@@ -1 +1 @@
-Subproject commit 6b89540de309274bb7fdf10493879dd35c2792e1
+Subproject commit 890e2306fca77146648f061ae754bec18304d4b7