Removed useless code + updated ms2 with new opensles sound card

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 := \

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+

mediastreamer2 @ 509430ba

-Subproject commit bba5dff9ea4d4b6bc84d6b9b1e17469a3f8e6869
+Subproject commit 509430ba06b18bbfb7d2d820ad86c7dcdb22af99