Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ZRTP on old arm devices.

Browse source
This commit is contained in:
Guillaume Beraudo 2011-08-01 10:09:11 +02:00
parent bc755f8810
commit 10e8a7ab09
10 changed files with 41 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
jni/Android.mk
View file

@ -7,7 +7,7 @@ LINPHONE_VIDEO=1
endif endif
ifeq ($(TARGET_ARCH_ABI),armeabi-v7a) ##ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
ifeq ($(BUILD_GPLV3_ZRTP), 1) ifeq ($(BUILD_GPLV3_ZRTP), 1)
BUILD_SRTP=1 BUILD_SRTP=1
ZRTP_C_INCLUDE= \ ZRTP_C_INCLUDE= \
@ -19,7 +19,7 @@ SRTP_C_INCLUDE= \
$(root-dir)/submodules/externals/srtp/include \ $(root-dir)/submodules/externals/srtp/include \
$(root-dir)/submodules/externals/srtp/crypto/include $(root-dir)/submodules/externals/srtp/crypto/include
endif endif
endif #endif
@ -49,6 +49,8 @@ include $(root-dir)/submodules/externals/build/x264/Android.mk
endif endif
include $(root-dir)/submodules/externals/build/ffmpeg/Android.mk include $(root-dir)/submodules/externals/build/ffmpeg/Android.mk
endif #armeabi-v7a
ifeq ($(BUILD_GPLV3_ZRTP), 1) ifeq ($(BUILD_GPLV3_ZRTP), 1)
include $(root-dir)/submodules/externals/build/libzrtpcpp/Android.mk include $(root-dir)/submodules/externals/build/libzrtpcpp/Android.mk
@ -57,7 +59,6 @@ endif
ifeq ($(BUILD_SRTP), 1) ifeq ($(BUILD_SRTP), 1)
include $(root-dir)/submodules/externals/build/srtp/Android.mk include $(root-dir)/submodules/externals/build/srtp/Android.mk
endif endif
endif #armeabi-v7a
include $(root-dir)/submodules/linphone/build/android/Android.mk include $(root-dir)/submodules/linphone/build/android/Android.mk

2
src/org/linphone/core/LinphoneCoreFactoryImpl.java
View file

@ -63,6 +63,8 @@ public class LinphoneCoreFactoryImpl extends LinphoneCoreFactory {
//Main library //Main library
System.loadLibrary("linphone"); System.loadLibrary("linphone");
Version.dumpCapabilities();
} }
@Override @Override
public LinphoneAuthInfo createAuthInfo(String username, String password, public LinphoneAuthInfo createAuthInfo(String username, String password,

7
src/org/linphone/core/Version.java
View file

@ -73,4 +73,11 @@ public class Version {
public static boolean hasZrtp(){ public static boolean hasZrtp(){
return nativeHasZrtp(); 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());
}
} }

2
src/org/linphone/core/video/AndroidCameraConf5.java
View file

@ -27,8 +27,6 @@ class AndroidCameraConf5 implements AndroidCameraConf {
public AndroidCameras getFoundCameras() {return foundCameras;} public AndroidCameras getFoundCameras() {return foundCameras;}
public AndroidCameraConf5() { public AndroidCameraConf5() {
Log.i("Detecting cameras");
// Defaults // Defaults
foundCameras = new AndroidCameras(); foundCameras = new AndroidCameras();

16
submodules/externals/build/libzrtpcpp/Android.mk vendored
View file

@ -3,7 +3,6 @@ LOCAL_EXTERNALS:= $(call my-dir)/../..
LOCAL_PATH:= $(LOCAL_EXTERNALS:=)/libzrtpcpp LOCAL_PATH:= $(LOCAL_EXTERNALS:=)/libzrtpcpp
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE:= libzrtpcpp
LOCAL_SRC_FILES := \ LOCAL_SRC_FILES := \
@ -55,12 +54,23 @@ LOCAL_SRC_FILES += \
LOCAL_CFLAGS := -D__EXPORT="" LOCAL_CFLAGS := -D__EXPORT=""
LOCAL_SHARED_LIBRARIES := liblincrypto liblinssl
LOCAL_C_INCLUDES += \ LOCAL_C_INCLUDES += \
$(LOCAL_PATH)/src/ \ $(LOCAL_PATH)/src/ \
$(LOCAL_EXTERNALS)/openssl \ $(LOCAL_EXTERNALS)/openssl \
$(LOCAL_EXTERNALS)/openssl/include $(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

13
submodules/externals/build/srtp/Android.mk vendored
View file

@ -2,7 +2,6 @@
LOCAL_PATH:= $(call my-dir)/../../srtp LOCAL_PATH:= $(call my-dir)/../../srtp
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE:= libsrtp
LOCAL_SRC_FILES := \ LOCAL_SRC_FILES := \
srtp/srtp.c \ srtp/srtp.c \
crypto/ae_xfm/xfm.c \ crypto/ae_xfm/xfm.c \
@ -49,5 +48,15 @@ LOCAL_C_INCLUDES += \
$(LOCAL_PATH)/include \ $(LOCAL_PATH)/include \
$(LOCAL_PATH)/crypto/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

2
submodules/externals/exosip vendored

@ -1 +1 @@
Subproject commit 7aba625f1c2a16cdac6b41b190cb2d46c8578cfe Subproject commit f5a029b617e681b019f7ae3e58f02c6912682768

2
submodules/linphone

@ -1 +1 @@
Subproject commit b0e75d9d78307802a540ca1cf611d47392ebfc99 Subproject commit bfb27bb7cfc303bb3fbdaea3eea719c7eda2e4bb