Permalink
Browse files

patch add-submodules

  • Loading branch information...
dmonakhov committed May 16, 2012
1 parent 7d5fe2d commit b7727e1f4fc8cb2865d659d780b95049111ffb13
View
@@ -0,0 +1,20 @@
+[submodule "submodules/externals/openssl"]
+ path = submodules/externals/openssl
+ url = git://git.linphone.org/android-openssl.git
+ ignore = untracked
+[submodule "submodules/externals/srtp"]
+ path = submodules/externals/srtp
+ url = git://git.linphone.org/srtp.git
+ ignore = untracked
+[submodule "submodules/externals/libjingle"]
+ path = submodules/externals/libjingle
+ url = git://github.com/dmonakhov/libjingle.git
+ ignore = untracked
+[submodule "submodules/externals/gtest"]
+ path = submodules/externals/gtest
+ url = git://github.com/dmonakhov/googletest.git
+ ignore = untracked
+[submodule "submodules/externals/expat"]
+ path = submodules/externals/expat
+ url = https://android.googlesource.com/platform/external/expat
+ ignore = untracked
View
@@ -0,0 +1,56 @@
+# script expect linphone-root-dir variable to be set by parent !
+
+ifeq ($(BUILD_JINGLE), 1)
+ BUILD_SRTP=1
+ BUILD_EXPAT=1
+endif
+
+ifeq ($(BUILD_UNITTEST), 1)
+ BUILD_GTEST=1
+endif
+
+ifeq ($(BUILD_SRTP), 1)
+SRTP_C_INCLUDE= \
+ $(libjingle-root-dir)/submodules/externals/srtp \
+ $(libjingle-root-dir)/submodules/externals/srtp/include \
+ $(libjingle-root-dir)/submodules/externals/srtp/crypto/include
+endif
+
+ifeq ($(BUILD_EXPAT), 1)
+EXPAT_C_INCLUDE= \
+ $(libjingle-root-dir)/submodules/externals/expat/lib
+endif
+#endif
+
+
+# Openssl
+ifeq ($(wildcard $(libjingle-root-dir)/submodules/externals/prebuilts/ssl.mk),)
+include $(libjingle-root-dir)/submodules/externals/openssl/Android.mk
+else
+include $(libjingle-root-dir)/submodules/externals/prebuilts/ssl.mk
+include $(libjingle-root-dir)/submodules/externals/prebuilts/crypto.mk
+endif
+
+# Srtp
+ifeq ($(BUILD_SRTP), 1)
+include $(libjingle-root-dir)/submodules/externals/build/srtp/Android.mk
+endif
+
+ifeq ($(BUILD_EXPAT), 1)
+$(info Build libexpat)
+include $(libjingle-root-dir)/submodules/externals/build/expat/Android.mk
+endif
+
+ifeq ($(BUILD_GTEST), 1)
+$(info Build libgtest)
+include $(libjingle-root-dir)/submodules/externals/build/gtest/Android.mk
+endif
+
+# Libjingle
+ifeq ($(BUILD_JINGLE), 1)
+include $(libjingle-root-dir)/submodules/externals/libjingle/Android.mk
+ifeq ($(BUILD_UNITTEST), 1)
+$(info BUILD_UNITTEST=1)
+include $(libjingle-root-dir)/submodules/externals/libjingle/Unittest.mk
+endif
+endif
View
@@ -0,0 +1,44 @@
+APP_PROJECT_PATH := $(call my-dir)/../
+APP_MODULES := libjingle
+
+APP_STL := stlport_static
+
+#default values
+BUILD_JINGLE=1
+BUILD_EXPAT=1
+
+#default values
+ifeq ($(BUILD_SRTP),)
+BUILD_SRTP=1
+endif
+
+ifeq ($(BUILD_CMDTOOLS),)
+BUILD_CMDTOOLS=1
+endif
+
+ifeq ($(BUILD_UNITTEST),)
+BUILD_UNITTEST=0
+endif
+
+libjingle-root-dir:=$(APP_PROJECT_PATH)
+
+ifeq ($(BUILD_CMDTOOLS), 1)
+APP_MODULES += callapp
+endif
+
+ifeq ($(BUILD_UNITTEST), 1)
+APP_MODULES += \
+ base_unittest \
+ p2p_unittest \
+ media_unittest \
+ sound_unittest \
+ xmllight_unittest \
+ xmpp_unittest
+endif
+
+
+APP_BUILD_SCRIPT:=$(call my-dir)/Android.mk
+APP_PLATFORM := android-8
+#APP_ABI := armeabi
+APP_ABI := armeabi-v7a armeabi
+APP_CFLAGS:=-DDISABLE_NEON
@@ -0,0 +1,17 @@
+LOCAL_PATH:= $(call my-dir)/../../expat
+include $(CLEAR_VARS)
+
+LOCAL_MODULE:= libexpat_static
+
+LOCAL_SRC_FILES := \
+ lib/xmlparse.c \
+ lib/xmlrole.c \
+ lib/xmltok.c
+
+#LOCAL_CFLAGS := -Wall -Wmissing-prototypes -Wstrict-prototypes -fexceptions -DHAVE_EXPAT_CONFIG_H
+LOCAL_CFLAGS := -DHAVE_EXPAT_CONFIG_H
+
+LOCAL_C_INCLUDES += \
+ $(LOCAL_PATH)/lib
+
+include $(BUILD_STATIC_LIBRARY)
@@ -0,0 +1,63 @@
+
+LOCAL_PATH:= $(call my-dir)/../../srtp
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := \
+ srtp/srtp.c \
+ srtp/ekt.c \
+ crypto/ae_xfm/xfm.c \
+ crypto/cipher/aes.c \
+ crypto/cipher/aes_cbc.c \
+ crypto/cipher/aes_icm.c \
+ crypto/cipher/cipher.c \
+ crypto/cipher/null_cipher.c \
+ crypto/hash/auth.c \
+ crypto/hash/hmac.c \
+ crypto/hash/null_auth.c \
+ crypto/hash/sha1.c \
+ crypto/kernel/alloc.c \
+ crypto/kernel/err.c \
+ crypto/kernel/key.c \
+ crypto/kernel/crypto_kernel.c \
+ crypto/math/gf2_8.c \
+ crypto/math/stat.c \
+ crypto/replay/rdb.c \
+ crypto/replay/rdbx.c \
+ crypto/replay/ut_sim.c \
+ crypto/rng/ctr_prng.c \
+ crypto/rng/prng.c
+
+LOCAL_CFLAGS := -Wall -O4 -fexpensive-optimizations -funroll-loops -DCPU_CISC -include config.h
+
+ifeq ($(SRTP_USES_LINUX_KERNEL), 1)
+LOCAL_SRC_FILES += \
+ crypto/rng/rand_linux_kernel.c
+LOCAL_CFLAGS += -DSRTP_KERNEL -DSRTP_KERNEL_LINUX
+else
+LOCAL_SRC_FILES += \
+ crypto/rng/rand_source.c
+endif
+
+
+ifeq ($(SRTP_USES_MATH),1)
+LOCAL_SRC_FILES += crypto/math/math.c
+else
+LOCAL_SRC_FILES += crypto/math/datatypes.c
+endif
+
+LOCAL_C_INCLUDES += \
+ $(LOCAL_PATH)/include \
+ $(LOCAL_PATH)/crypto/include
+
+
+
+# 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
+
+
@@ -0,0 +1,171 @@
+/* crypto/include/config.h. Generated by configure. */
+/* config_in.h. Generated from configure.in by autoheader. */
+
+/* Define if building for a CISC machine (e.g. Intel). */
+#define CPU_CISC 1
+
+/* Define if building for a RISC machine (assume slow byte access). */
+/* #undef CPU_RISC */
+
+/* Path to random device */
+/* #undef DEV_URANDOM */
+
+/* Define to compile in dynamic debugging system. */
+#define ENABLE_DEBUGGING 0
+
+/* Report errors to this file. */
+/* #undef ERR_REPORTING_FILE */
+
+/* Define to use logging to stdout. */
+#define ERR_REPORTING_STDOUT 1
+
+/* Define this to use ISMAcryp code. */
+/* #undef GENERIC_AESICM */
+
+/* Define to 1 if you have the <arpa/inet.h> header file. */
+#define HAVE_ARPA_INET_H 1
+
+/* Define to 1 if you have the <byteswap.h> header file. */
+/* #undef HAVE_BYTESWAP_H */
+
+/* Define to 1 if you have the `inet_aton' function. */
+#define HAVE_INET_ATON 1
+
+/* Define to 1 if the system has the type `int16_t'. */
+#define HAVE_INT16_T 1
+
+/* Define to 1 if the system has the type `int32_t'. */
+#define HAVE_INT32_T 1
+
+/* Define to 1 if the system has the type `int8_t'. */
+#define HAVE_INT8_T 1
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#define HAVE_INTTYPES_H 1
+
+/* Define to 1 if you have the `socket' library (-lsocket). */
+/* #undef HAVE_LIBSOCKET */
+
+/* Define to 1 if you have the <machine/types.h> header file. */
+/*#define HAVE_MACHINE_TYPES_H 1*/
+
+/* Define to 1 if you have the <memory.h> header file. */
+#define HAVE_MEMORY_H 1
+
+/* Define to 1 if you have the <netinet/in.h> header file. */
+#define HAVE_NETINET_IN_H 1
+
+/* Define to 1 if you have the `socket' function. */
+#define HAVE_SOCKET 1
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#define HAVE_STDINT_H 1
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#define HAVE_STDLIB_H 1
+
+/* Define to 1 if you have the <strings.h> header file. */
+#define HAVE_STRINGS_H 1
+
+/* Define to 1 if you have the <string.h> header file. */
+#define HAVE_STRING_H 1
+
+/* Define to 1 if you have the <syslog.h> header file. */
+#define HAVE_SYSLOG_H 1
+
+/* Define to 1 if you have the <sys/int_types.h> header file. */
+/* #undef HAVE_SYS_INT_TYPES_H */
+
+/* Define to 1 if you have the <sys/socket.h> header file. */
+#define HAVE_SYS_SOCKET_H 1
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#define HAVE_SYS_STAT_H 1
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#define HAVE_SYS_TYPES_H 1
+
+/* Define to 1 if you have the <sys/uio.h> header file. */
+#define HAVE_SYS_UIO_H 1
+
+/* Define to 1 if the system has the type `uint16_t'. */
+#define HAVE_UINT16_T 1
+
+/* Define to 1 if the system has the type `uint32_t'. */
+#define HAVE_UINT32_T 1
+
+/* Define to 1 if the system has the type `uint64_t'. */
+#define HAVE_UINT64_T 1
+
+/* Define to 1 if the system has the type `uint8_t'. */
+#define HAVE_UINT8_T 1
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#define HAVE_UNISTD_H 1
+
+/* Define to 1 if you have the `usleep' function. */
+#define HAVE_USLEEP 1
+
+/* Define to 1 if you have the <windows.h> header file. */
+/* #undef HAVE_WINDOWS_H */
+
+/* Define to 1 if you have the <winsock2.h> header file. */
+/* #undef HAVE_WINSOCK2_H */
+
+/* Define to use X86 inlined assembly code */
+/* #undef HAVE_X86 */
+
+/* Define to the address where bug reports for this package should be sent. */
+/*#define PACKAGE_BUGREPORT ""*/
+
+/* Define to the full name of this package. */
+/*#define PACKAGE_NAME ""*/
+
+/* Define to the full name and version of this package. */
+/*#define PACKAGE_STRING ""*/
+
+/* Define to the one symbol short name of this package. */
+/*#define PACKAGE_TARNAME ""*/
+
+/* Define to the version of this package. */
+/*#define PACKAGE_VERSION ""*/
+
+/* The size of a `unsigned long', as computed by sizeof. */
+#define SIZEOF_UNSIGNED_LONG 4
+
+/* The size of a `unsigned long long', as computed by sizeof. */
+#define SIZEOF_UNSIGNED_LONG_LONG 8
+
+/* Define to use GDOI. */
+/* #undef SRTP_GDOI */
+
+/* Define to compile for kernel contexts. */
+/* #undef SRTP_KERNEL */
+
+/* Define to compile for Linux kernel context. */
+/* #undef SRTP_KERNEL_LINUX */
+
+/* Define to 1 if you have the ANSI C header files. */
+#define STDC_HEADERS 1
+
+/* Write errors to this file */
+/* #undef USE_ERR_REPORTING_FILE */
+
+/* Define to use syslog logging. */
+/* #undef USE_SYSLOG */
+
+/* Define to 1 if your processor stores words with the most significant byte
+ first (like Motorola and SPARC, unlike Intel and VAX). */
+/* #undef WORDS_BIGENDIAN */
+
+/* Define to empty if `const' does not conform to ANSI C. */
+/* #undef const */
+
+/* Define to `__inline__' or `__inline' if that's what the C compiler
+ calls it, or to nothing if 'inline' is not supported under any name. */
+#ifndef __cplusplus
+/* #undef inline */
+#endif
+
+/* Define to `unsigned' if <sys/types.h> does not define. */
+/* #undef size_t */
Submodule expat added at 283041
Submodule gtest added at 361c8f
Submodule libjingle added at e47a0f
Submodule openssl added at 2bc154
Submodule srtp added at c01a03

0 comments on commit b7727e1

Please sign in to comment.