Commit 9097de84 authored by Sylvain Berfini's avatar Sylvain Berfini 🎩

Updated submodules

parent 27e7570e
Pipeline #182 failed with stage
in 0 seconds
[submodule "submodules/bcg729"]
path = submodules/bcg729
url = https://gitlab.linphone.org/BC/public/bcg729.git
[submodule "submodules/bctoolbox"]
path = submodules/bctoolbox
url = https://gitlab.linphone.org/BC/public/bctoolbox.git
[submodule "submodules/bcunit"]
path = submodules/bcunit
url = https://gitlab.linphone.org/BC/public/bcunit.git
[submodule "submodules/belcard"]
path = submodules/belcard
url = https://gitlab.linphone.org/BC/public/belcard.git
[submodule "submodules/belle-sip"]
path = submodules/belle-sip
url = https://gitlab.linphone.org/BC/public/belle-sip.git
[submodule "submodules/belr"]
path = submodules/belr
url = https://gitlab.linphone.org/BC/public/belr.git
[submodule "submodules/bzrtp"]
path = submodules/bzrtp
url = https://gitlab.linphone.org/BC/public/bzrtp.git
[submodule "submodules/cmake-builder"]
path = submodules/cmake-builder
url = https://gitlab.linphone.org/BC/public/linphone-cmake-builder.git
[submodule "submodules/linphone"]
path = submodules/linphone
url = https://gitlab.linphone.org/BC/public/linphone.git
[submodule "submodules/mediastreamer2"]
path = submodules/mediastreamer2
url = https://gitlab.linphone.org/BC/public/mediastreamer2.git
[submodule "submodules/msamr"]
path = submodules/msamr
url = https://gitlab.linphone.org/BC/public/msamr.git
[submodule "submodules/mscodec2"]
path = submodules/mscodec2
url = https://gitlab.linphone.org/BC/public/mscodec2.git
[submodule "submodules/msopenh264"]
path = submodules/msopenh264
url = https://gitlab.linphone.org/BC/public/msopenh264.git
[submodule "submodules/mssilk"]
path = submodules/mssilk
url = https://gitlab.linphone.org/BC/public/mssilk.git
[submodule "submodules/mswebrtc"]
path = submodules/mswebrtc
url = https://gitlab.linphone.org/BC/public/mswebrtc.git
[submodule "submodules/ortp"]
path = submodules/ortp
url = https://gitlab.linphone.org/BC/public/ortp.git
[submodule "submodules/externals/antlr3"]
path = submodules/externals/antlr3
url = https://gitlab.linphone.org/BC/public/external/antlr3.git
[submodule "submodules/externals/bv16-floatingpoint"]
path = submodules/externals/bv16-floatingpoint
url = https://gitlab.linphone.org/BC/public/external/bv16-floatingpoint.git
[submodule "submodules/externals/gsm"]
path = submodules/externals/gsm
url = https://gitlab.linphone.org/BC/public/external/gsm.git
[submodule "submodules/externals/libjpeg-turbo"]
path = submodules/externals/libjpeg-turbo
url = https://gitlab.linphone.org/BC/public/external/libjpeg-turbo.git
[submodule "submodules/externals/speex"]
path = submodules/externals/speex
url = https://gitlab.linphone.org/BC/public/external/speex.git
[submodule "submodules/externals/ffmpeg"]
path = submodules/externals/ffmpeg
url = https://gitlab.linphone.org/BC/public/external/ffmpeg.git
ignore = dirty
[submodule "submodules/externals/x264"]
path = submodules/externals/x264
url = https://gitlab.linphone.org/BC/public/external/x264.git
ignore = dirty
[submodule "submodules/msx264"]
path = submodules/msx264
url = https://gitlab.linphone.org/BC/public/msx264.git
[submodule "submodules/externals/opencore-amr"]
path = submodules/externals/opencore-amr
url = https://gitlab.linphone.org/BC/public/external/opencore-amr.git
ignore = dirty
[submodule "submodules/msamr"]
path = submodules/msamr
url = https://gitlab.linphone.org/BC/public/msamr.git
[submodule "submodules/externals/libvpx"]
path = submodules/externals/libvpx
url = https://gitlab.linphone.org/BC/public/external/libvpx.git
ignore = dirty
[submodule "submodules/bzrtp"]
path = submodules/bzrtp
url = https://gitlab.linphone.org/BC/public/bzrtp.git
[submodule "submodules/externals/srtp"]
path = submodules/externals/srtp
url = https://gitlab.linphone.org/BC/public/external/srtp.git
[submodule "submodules/mssilk"]
path = submodules/mssilk
url = https://gitlab.linphone.org/BC/public/mssilk.git
[submodule "submodules/bcg729"]
path = submodules/bcg729
url = https://gitlab.linphone.org/BC/public/bcg729.git
[submodule "submodules/belle-sip"]
path = submodules/belle-sip
url = https://gitlab.linphone.org/BC/public/belle-sip.git
[submodule "submodules/externals/libxml2"]
path = submodules/externals/libxml2
url = https://gitlab.linphone.org/BC/public/external/libxml2.git
[submodule "submodules/externals/mbedtls"]
path = submodules/externals/mbedtls
url = https://gitlab.linphone.org/BC/public/external/mbedtls.git
[submodule "submodules/externals/opencore-amr"]
path = submodules/externals/opencore-amr
url = https://gitlab.linphone.org/BC/public/external/opencore-amr.git
ignore = dirty
[submodule "submodules/externals/libupnp"]
path = submodules/externals/libupnp
url = https://gitlab.linphone.org/BC/public/external/libupnp.git
[submodule "submodules/externals/opus"]
path = submodules/externals/opus
url = https://gitlab.linphone.org/BC/public/external/opus.git
[submodule "submodules/externals/speex"]
path = submodules/externals/speex
url = https://gitlab.linphone.org/BC/public/external/speex.git
[submodule "submodules/externals/srtp"]
path = submodules/externals/srtp
url = https://gitlab.linphone.org/BC/public/external/srtp.git
[submodule "submodules/externals/vo-amrwbenc"]
path = submodules/externals/vo-amrwbenc
url = https://gitlab.linphone.org/BC/public/external/vo-amrwbenc.git
ignore = dirty
[submodule "submodules/mswebrtc"]
path = submodules/mswebrtc
url = https://gitlab.linphone.org/BC/public/mswebrtc.git
[submodule "submodules/msopenh264"]
path = submodules/msopenh264
url = https://gitlab.linphone.org/BC/public/msopenh264.git
[submodule "submodules/externals/openh264"]
path = submodules/externals/openh264
url = https://gitlab.linphone.org/BC/public/external/openh264.git
ignore = dirty
[submodule "submodules/mscodec2"]
path = submodules/mscodec2
url = https://gitlab.linphone.org/BC/public/mscodec2.git
[submodule "submodules/bctoolbox"]
path = submodules/bctoolbox
url = https://gitlab.linphone.org/BC/public/bctoolbox.git
[submodule "submodules/externals/mbedtls"]
path = submodules/externals/mbedtls
url = https://gitlab.linphone.org/BC/public/external/mbedtls.git
ignore = dirty
[submodule "submodules/cmake-builder"]
path = submodules/cmake-builder
url = https://gitlab.linphone.org/BC/public/linphone-cmake-builder.git
[submodule "submodules/externals/bv16-floatingpoint"]
path = submodules/externals/bv16-floatingpoint
url = https://gitlab.linphone.org/BC/public/external/bv16-floatingpoint.git
[submodule "submodules/belr"]
path = submodules/belr
url = https://gitlab.linphone.org/BC/public/belr.git
[submodule "submodules/belcard"]
path = submodules/belcard
url = https://gitlab.linphone.org/BC/public/belcard.git
[submodule "submodules/bcunit"]
path = submodules/bcunit
url = https://gitlab.linphone.org/BC/public/bcunit.git
[submodule "submodules/externals/vo-amrwbenc"]
path = submodules/externals/vo-amrwbenc
url = https://gitlab.linphone.org/BC/public/external/vo-amrwbenc.git
[submodule "submodules/externals/codec2"]
path = submodules/externals/codec2
url = https://gitlab.linphone.org/BC/public/external/codec2.git
[submodule "submodules/externals/libjpeg-turbo"]
path = submodules/externals/libjpeg-turbo
url = https://gitlab.linphone.org/BC/public/external/libjpeg-turbo.git
[submodule "submodules/mediastreamer2"]
path = submodules/mediastreamer2
url = https://gitlab.linphone.org/BC/public/mediastreamer2.git
[submodule "submodules/oRTP"]
path = submodules/oRTP
url = https://gitlab.linphone.org/BC/public/ortp.git
[submodule "submodules/bcmatroska2"]
path = submodules/bcmatroska2
url = https://gitlab.linphone.org/BC/public/bcmatroska2.git
[submodule "submodules/externals/xerces-c"]
path = submodules/externals/xerces-c
url = https://gitlab.linphone.org/BC/public/external/xerces-c.git
[submodule "submodules/externals/libxsd"]
path = submodules/externals/libxsd
url = https://gitlab.linphone.org/BC/public/external/libxsd.git
[submodule "submodules/externals/soci"]
path = submodules/externals/soci
url = https://gitlab.linphone.org/BC/public/external/soci.git
[submodule "submodules/externals/zxing-cpp"]
path = submodules/externals/zxing-cpp
url = https://gitlab.linphone.org/BC/public/external/zxing-cpp.git
......@@ -50,6 +50,10 @@ class AndroidTarget(prepare.Target):
self.toolchain_file = 'toolchains/toolchain-android-' + arch + '.cmake'
self.output = 'android/liblinphone-sdk/android-' + arch
self.external_source_path = os.path.join(current_path, 'submodules')
external_builders_path = os.path.join(current_path, 'cmake_builder')
self.additional_args = [
"-DLINPHONE_BUILDER_EXTERNAL_BUILDERS_PATH=" + external_builders_path
]
class AndroidArmTarget(AndroidTarget):
......@@ -91,14 +95,18 @@ android_targets = {
'x86_64': AndroidX86_64Target()
}
android_virtual_targets = {
'all': ['arm', 'armv7', 'arm64', 'x86', 'x86_64']
}
class AndroidPreparator(prepare.Preparator):
def __init__(self, targets=android_targets):
prepare.Preparator.__init__(self, targets, default_targets=['armv7', 'arm64', 'x86'])
self.min_supported_ndk = 10
self.max_supported_ndk = 14
prepare.Preparator.__init__(self, targets, default_targets=['armv7', 'arm64'], virtual_targets=android_virtual_targets)
self.min_supported_ndk = 16
self.max_supported_ndk = 17
self.unsupported_ndk_version = None
self.min_cmake_version = "3.7"
self.min_cmake_version = "3.10"
self.release_with_debug_info = True
self.veryclean = True
self.show_gpl_disclaimer = True
......@@ -121,8 +129,13 @@ class AndroidPreparator(prepare.Preparator):
self.additional_args += ["-DENABLE_OPUS=YES"]
self.additional_args += ["-DENABLE_SILK=YES"]
self.additional_args += ["-DENABLE_SPEEX=YES"]
self.additional_args += ["-DENABLE_FFMPEG=YES"]
self.additional_args += ["-DENABLE_H263=YES"]
self.additional_args += ["-DENABLE_H263P=YES"]
self.additional_args += ["-DENABLE_MPEG4=YES"]
self.additional_args += ["-DENABLE_OPENH264=YES"]
self.additional_args += ["-DENABLE_VPX=YES"]
# self.additional_args += ["-DENABLE_X264=YES"] # Do not activate x264 because it has text relocation issues
def list_feature_target(self):
return android_targets['armv7']
......@@ -147,8 +160,19 @@ class AndroidPreparator(prepare.Preparator):
if len(python_config_files) > 0:
version = open(python_config_files[0]).readlines()[0]
res = re.match('^.*/(aosp-)?ndk-r(\d+).*$', version)
version = int(res.group(2))
retval = False
if res is not None: # Will be if NDK < 16
version = int(res.group(2))
retval = False
else:
release_file = os.path.join(ndk_path, 'source.properties') # Since NDK 16
if os.path.isfile(release_file):
version = open(release_file).read().strip()
res = re.findall(r'(?:(\d+))', version)
version = int(res[0])
retval = False
else:
error("Could not get Android NDK version!")
sys.exit(-1)
else:
error("Could not get Android NDK version!")
sys.exit(-1)
......@@ -210,6 +234,11 @@ all: generate-android-sdk
android-build: $(addprefix android-, $(addsuffix -build, $(android-archs)))
clean: java-clean
java-clean:
\t./gradlew clean
android-copy-libs:
\trm -rf LinphoneXamarin/LinphoneXamarin/LinphoneXamarin.Android/Libs/armeabi-v7a
\tif test -d "android/liblinphone-sdk/android-armv7"; then \\
......@@ -236,19 +265,15 @@ android-copy-libs:
\t\tsh android/android-x86/strip.sh LinphoneXamarin/LinphoneXamarin/LinphoneXamarin.Android/Libs/x86/*.so; \\
\tfi
generate-android-sdk: clean android-build android-copy-libs create-jar
create-jar:
\t./gradlew assembleRelease
\t./gradlew classJar
generate-android-sdk: clean android-build android-copy-libs create-jar
{arch_targets}
clean: java-clean
java-clean:
./gradlew clean
help-prepare-options:
\t@echo "prepare.py was previously executed with the following options:"
\t@echo " {options}"
......
############################################################################
# CMakeLists.txt
# Copyright (C) 2018 Belledonne Communications, Grenoble France
#
############################################################################
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
############################################################################
# Blacklist these dependencies because they are useless for now
#lcb_blacklist_dependencies("libxsd" "xerces-c" "soci")
Subproject commit f4b87c521a513b540f34a72ef82a52364929d0be
Subproject commit ca4a89930dd8db94a60ae4a1dbf44a3710497429
Subproject commit e34db6796ade971615d4b572bda87d9f699ea497
Subproject commit ed53ae3c9da4fb15c13454153383014b3257939a
Subproject commit b9e1951be4575c62e326d761a7f7c79c5cce9cb9
Subproject commit ab5416d66620f32ff6882b6e29dec63203dbca41
Subproject commit 4d19962374a009a94974f439219ee714136d7264
Subproject commit 0f999ecc3d304923b6338d3f48d44ac8ddfd9be8
Subproject commit 4f32b9c29c4ab8c4ccfc1e0899019a811d495054
Subproject commit cfad8fcc28c7cdba69684c8e35846711aaa16775
Subproject commit 404cd869464fa591c2a11fb91242c2983f73270f
Subproject commit f58510c8ce6cd89dadff2b29574d03b05c6efcc9
Subproject commit 1db66897fa0f2f4b397bb961b3e5a747c170ed40
Subproject commit 9f34b5eade75fd8e1548e6c7daf278d6ffb73526
Subproject commit 0e99446a237bef6704d45f74d504ae8aafa45f9a
Subproject commit bdd0ae104378fc5435cbe6b03d7ae201848838d9
Subproject commit f16168c8ef95bf00d4e7d702832f8771646686ba
Subproject commit c943f708f1853de4eb15e5a94cf0b35d108da87a
Subproject commit bc5a5d658320c37e206fe4e7b525b4a24466d0c6
Subproject commit 34af5de2ee71dde72a010fde336d2efa9c386abd
Subproject commit addacec784478244f66cd579fdc93b2e01e11c50
Subproject commit 83d21d543c26a31943b2bd08c66b029f2ef742be
Subproject commit d1fc622b2cbe5fe9b55959b32af054c7ae75e1a1
Subproject commit 4a6d98d2ad797c37a9d12c1da772ca813c2f95b7
Subproject commit 8906fb7b243fa455fd9b091e4ac611536b2dbba4
Subproject commit f71e66823da55b8a985d791cda8ddb0159a07430
Subproject commit ca2656e9bf06ce344c839cb0ea004ae2e6975c84
Subproject commit e5789c2e4ce0464cbaf67cd0ca6602f0b713bcf2
Subproject commit 52d3169349b55b27090ecb81f88d10ebb65fa469
Subproject commit 3a398b4000f29c67e010057f718c136ca245a9a8
Subproject commit e7722332645b324dfc6aba3e94ab71750a3c0fd7
Subproject commit a88be02b93e2274ae3fcf80e1e0032adc43c0448
Subproject commit f680edf45368746987ece42dd0a1ca49c1b1b57e
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment