From 1817c82f7cd91b090f915e775e2a6ff83dd514e1 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@linphone.org>
Date: Wed, 5 Feb 2014 15:51:30 +0100
Subject: [PATCH] Removed useless code + updated ms2 with new opensles sound
card
---
build/android/Android.mk | 3 ---
java/impl/org/linphone/core/LinphoneCoreFactoryImpl.java | 5 -----
mediastreamer2 | 2 +-
3 files changed, 1 insertion(+), 9 deletions(-)
diff --git a/build/android/Android.mk b/build/android/Android.mk
index 8dfe0cb84d..8c64fae8ac 100755
--- a/build/android/Android.mk
+++ b/build/android/Android.mk
@@ -105,9 +105,6 @@ LOCAL_C_INCLUDES += \
$(LOCAL_PATH)/../../externals/libxml2/include \
$(LOCAL_PATH)/../../externals/build/libxml2
-ifeq ($(BUILD_OPENSLES_SOUNDCARD),1)
- LOCAL_LDLIBS += -lOpenSLES
-endif
LOCAL_LDLIBS += -llog -ldl
LOCAL_STATIC_LIBRARIES := \
diff --git a/java/impl/org/linphone/core/LinphoneCoreFactoryImpl.java b/java/impl/org/linphone/core/LinphoneCoreFactoryImpl.java
index 521a3d6b1b..8b1527b097 100644
--- a/java/impl/org/linphone/core/LinphoneCoreFactoryImpl.java
+++ b/java/impl/org/linphone/core/LinphoneCoreFactoryImpl.java
@@ -57,11 +57,6 @@ public class LinphoneCoreFactoryImpl extends LinphoneCoreFactory {
loadOptionalLibrary("avcodec-linphone-arm");
}
- // OPENSSL (cryptography)
- // linphone suffix avoids collision with libs in /system/lib
- loadOptionalLibrary("crypto-linphone-" + eabi);
- loadOptionalLibrary("ssl-linphone-" + eabi);
-
// Secure RTP and key negotiation
loadOptionalLibrary("srtp-" + eabi);
loadOptionalLibrary("zrtpcpp-" + eabi); // GPLv3+
diff --git a/mediastreamer2 b/mediastreamer2
index bba5dff9ea..509430ba06 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit bba5dff9ea4d4b6bc84d6b9b1e17469a3f8e6869
+Subproject commit 509430ba06b18bbfb7d2d820ad86c7dcdb22af99
--
GitLab