From 10e8a7ab09807e05d73107e7ec8259df7d1dc134 Mon Sep 17 00:00:00 2001 From: Guillaume Beraudo Date: Mon, 1 Aug 2011 10:09:11 +0200 Subject: [PATCH] ZRTP on old arm devices. --- jni/Android.mk | 7 ++++--- src/org/linphone/LinphoneManager.java | 2 +- src/org/linphone/LinphoneService.java | 2 +- .../linphone/core/LinphoneCoreFactoryImpl.java | 2 ++ src/org/linphone/core/Version.java | 7 +++++++ .../linphone/core/video/AndroidCameraConf5.java | 2 -- submodules/externals/build/libzrtpcpp/Android.mk | 16 +++++++++++++--- submodules/externals/build/srtp/Android.mk | 13 +++++++++++-- submodules/externals/exosip | 2 +- submodules/linphone | 2 +- 10 files changed, 41 insertions(+), 14 deletions(-) diff --git a/jni/Android.mk b/jni/Android.mk index 47792b3da..438143319 100755 --- a/jni/Android.mk +++ b/jni/Android.mk @@ -7,7 +7,7 @@ LINPHONE_VIDEO=1 endif -ifeq ($(TARGET_ARCH_ABI),armeabi-v7a) +##ifeq ($(TARGET_ARCH_ABI),armeabi-v7a) ifeq ($(BUILD_GPLV3_ZRTP), 1) BUILD_SRTP=1 ZRTP_C_INCLUDE= \ @@ -19,7 +19,7 @@ SRTP_C_INCLUDE= \ $(root-dir)/submodules/externals/srtp/include \ $(root-dir)/submodules/externals/srtp/crypto/include endif -endif +#endif @@ -49,6 +49,8 @@ include $(root-dir)/submodules/externals/build/x264/Android.mk endif include $(root-dir)/submodules/externals/build/ffmpeg/Android.mk +endif #armeabi-v7a + ifeq ($(BUILD_GPLV3_ZRTP), 1) include $(root-dir)/submodules/externals/build/libzrtpcpp/Android.mk @@ -57,7 +59,6 @@ endif ifeq ($(BUILD_SRTP), 1) include $(root-dir)/submodules/externals/build/srtp/Android.mk endif -endif #armeabi-v7a include $(root-dir)/submodules/linphone/build/android/Android.mk diff --git a/src/org/linphone/LinphoneManager.java b/src/org/linphone/LinphoneManager.java index cae39c679..107bbb9e7 100644 --- a/src/org/linphone/LinphoneManager.java +++ b/src/org/linphone/LinphoneManager.java @@ -329,7 +329,7 @@ public final class LinphoneManager implements LinphoneCoreListener { mLc.setPlaybackGain(3); mLc.setRing(null); mLc.setRootCA(linphoneRootCaFile); - + try { initFromConf(context); diff --git a/src/org/linphone/LinphoneService.java b/src/org/linphone/LinphoneService.java index ade250296..4def606b9 100644 --- a/src/org/linphone/LinphoneService.java +++ b/src/org/linphone/LinphoneService.java @@ -63,7 +63,7 @@ public final class LinphoneService extends Service implements LinphoneServiceLis /* Listener needs to be implemented in the Service as it calls * setLatestEventInfo and startActivity() which needs a context. */ - + private Handler mHandler = new Handler(); private static LinphoneService instance; diff --git a/src/org/linphone/core/LinphoneCoreFactoryImpl.java b/src/org/linphone/core/LinphoneCoreFactoryImpl.java index f92dd6c86..674b62450 100644 --- a/src/org/linphone/core/LinphoneCoreFactoryImpl.java +++ b/src/org/linphone/core/LinphoneCoreFactoryImpl.java @@ -63,6 +63,8 @@ public class LinphoneCoreFactoryImpl extends LinphoneCoreFactory { //Main library System.loadLibrary("linphone"); + + Version.dumpCapabilities(); } @Override public LinphoneAuthInfo createAuthInfo(String username, String password, diff --git a/src/org/linphone/core/Version.java b/src/org/linphone/core/Version.java index 14dff0c27..53ae2e05f 100644 --- a/src/org/linphone/core/Version.java +++ b/src/org/linphone/core/Version.java @@ -73,4 +73,11 @@ public class Version { public static boolean hasZrtp(){ return nativeHasZrtp(); } + + public static void dumpCapabilities(){ + StringBuilder sb = new StringBuilder(" ==== Capabilities dump ====\n"); + sb.append("Has neon: ").append(Boolean.toString(hasNeon())).append("\n"); + sb.append("Has ZRTP: ").append(Boolean.toString(hasZrtp())).append("\n"); + Log.i(sb.toString()); + } } diff --git a/src/org/linphone/core/video/AndroidCameraConf5.java b/src/org/linphone/core/video/AndroidCameraConf5.java index f8dbe56cb..c9c3a1ade 100644 --- a/src/org/linphone/core/video/AndroidCameraConf5.java +++ b/src/org/linphone/core/video/AndroidCameraConf5.java @@ -27,8 +27,6 @@ class AndroidCameraConf5 implements AndroidCameraConf { public AndroidCameras getFoundCameras() {return foundCameras;} public AndroidCameraConf5() { - Log.i("Detecting cameras"); - // Defaults foundCameras = new AndroidCameras(); diff --git a/submodules/externals/build/libzrtpcpp/Android.mk b/submodules/externals/build/libzrtpcpp/Android.mk index cd9898327..b78eb74a8 100644 --- a/submodules/externals/build/libzrtpcpp/Android.mk +++ b/submodules/externals/build/libzrtpcpp/Android.mk @@ -3,7 +3,6 @@ LOCAL_EXTERNALS:= $(call my-dir)/../.. LOCAL_PATH:= $(LOCAL_EXTERNALS:=)/libzrtpcpp include $(CLEAR_VARS) -LOCAL_MODULE:= libzrtpcpp LOCAL_SRC_FILES := \ @@ -55,12 +54,23 @@ LOCAL_SRC_FILES += \ LOCAL_CFLAGS := -D__EXPORT="" -LOCAL_SHARED_LIBRARIES := liblincrypto liblinssl LOCAL_C_INCLUDES += \ $(LOCAL_PATH)/src/ \ $(LOCAL_EXTERNALS)/openssl \ $(LOCAL_EXTERNALS)/openssl/include -include $(BUILD_SHARED_LIBRARY) + + +# Build dynamic and static versions +ifeq ($(TARGET_ARCH_ABI),armeabi-v7a) +LOCAL_MODULE:= libzrtpcpp +LOCAL_SHARED_LIBRARIES := liblincrypto liblinssl +include $(BUILD_SHARED_LIBRARY) +else +LOCAL_STATIC_LIBRARIES := libcrypto-static libssl-static +LOCAL_MODULE:= libzrtpcpp-static +include $(BUILD_STATIC_LIBRARY) +endif + diff --git a/submodules/externals/build/srtp/Android.mk b/submodules/externals/build/srtp/Android.mk index 1fba2b9cc..c047702cd 100644 --- a/submodules/externals/build/srtp/Android.mk +++ b/submodules/externals/build/srtp/Android.mk @@ -2,7 +2,6 @@ LOCAL_PATH:= $(call my-dir)/../../srtp include $(CLEAR_VARS) -LOCAL_MODULE:= libsrtp LOCAL_SRC_FILES := \ srtp/srtp.c \ crypto/ae_xfm/xfm.c \ @@ -49,5 +48,15 @@ LOCAL_C_INCLUDES += \ $(LOCAL_PATH)/include \ $(LOCAL_PATH)/crypto/include -include $(BUILD_SHARED_LIBRARY) + + +# Build dynamic and static versions +ifeq ($(TARGET_ARCH_ABI),armeabi-v7a) +LOCAL_MODULE:= libsrtp +include $(BUILD_SHARED_LIBRARY) +else +LOCAL_MODULE:= libsrtp-static +include $(BUILD_STATIC_LIBRARY) +endif + diff --git a/submodules/externals/exosip b/submodules/externals/exosip index 7aba625f1..f5a029b61 160000 --- a/submodules/externals/exosip +++ b/submodules/externals/exosip @@ -1 +1 @@ -Subproject commit 7aba625f1c2a16cdac6b41b190cb2d46c8578cfe +Subproject commit f5a029b617e681b019f7ae3e58f02c6912682768 diff --git a/submodules/linphone b/submodules/linphone index b0e75d9d7..bfb27bb7c 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit b0e75d9d78307802a540ca1cf611d47392ebfc99 +Subproject commit bfb27bb7cfc303bb3fbdaea3eea719c7eda2e4bb