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

[Switch submodule branch] Update cmake-builder submodule.

Browse source
This commit is contained in:
Ghislain MARY 2018-01-19 15:33:04 +01:00
parent c5306f3cdd
commit 03e848d0e8
3 changed files with 57 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
cmake_builder/CMakeLists.txt Normal file
View file

@ -0,0 +1,25 @@
############################################################################
# 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")

28
prepare.py
View file

@ -50,6 +50,10 @@ class AndroidTarget(prepare.Target):
self.toolchain_file = 'toolchains/toolchain-android-' + arch + '.cmake'
self.output = '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):
@ -156,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)
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)
@ -238,6 +253,7 @@ $(TOPDIR)/res/raw/rootca.pem:
copy-libs:
\trm -rf libs-debug/armeabi
\trm -rf libs/armeabi
\trm -rf src/linphone-wrapper && mkdir -p src/linphone-wrapper/
\tif test -d "liblinphone-sdk/android-arm"; then \\
\t\tmkdir -p libs-debug/armeabi && \\
\t\tcp -f liblinphone-sdk/android-arm/lib/lib*.so libs-debug/armeabi && \\
@ -304,6 +320,18 @@ copy-libs:
\t\tcp -f liblinphone-sdk/android-x86/bin/gdbserver libs/x86 && \\
\t\tcp -f liblinphone-sdk/android-x86/bin/gdb.setup libs/x86; \\
\tfi
\tif test -d "liblinphone-sdk/android-arm/share/linphonej"; then \\
\t\tcp -R liblinphone-sdk/android-arm/share/linphonej/java/* src/linphone-wrapper; \\
\tfi
\tif test -d "liblinphone-sdk/android-armv7/share/linphonej"; then \\
\t\tcp -R liblinphone-sdk/android-armv7/share/linphonej/java/* src/linphone-wrapper; \\
\tfi
\tif test -d "liblinphone-sdk/android-arm64/share/linphonej"; then \\
\t\tcp -R liblinphone-sdk/android-arm64/share/linphonej/java/* src/linphone-wrapper; \\
\tfi
\tif test -d "liblinphone-sdk/android-x86/share/linphonej"; then \\
\t\tcp -R liblinphone-sdk/android-x86/share/linphonej/java/* src/linphone-wrapper; \\
\tfi
copy-libs-mediastreamer:
\trm -rf submodules/mediastreamer2/java/libs/armeabi

2
submodules/cmake-builder

@ -1 +1 @@
Subproject commit a6dff67cc8e5bb1e930cf1629dec835f94d6d626
Subproject commit bd973554739e1e991a8726e6a9b80ba0e78950fa