From fdcbbf5733d546507aca7ffe4af6a9383b054c8e Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Mon, 13 Jun 2016 10:40:27 +0200 Subject: [PATCH 01/14] Fix crash when deleting account + disabled delete button when there is no account to delete --- src/org/linphone/AccountPreferencesFragment.java | 2 +- src/org/linphone/LinphonePreferences.java | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/org/linphone/AccountPreferencesFragment.java b/src/org/linphone/AccountPreferencesFragment.java index 84c0ca59a..a1b217840 100644 --- a/src/org/linphone/AccountPreferencesFragment.java +++ b/src/org/linphone/AccountPreferencesFragment.java @@ -392,7 +392,7 @@ public class AccountPreferencesFragment extends PreferencesListFragment { } final Preference delete = manage.getPreference(2); - delete.setEnabled(true); + delete.setEnabled(!isNewAccount); delete.setOnPreferenceClickListener(new OnPreferenceClickListener() { public boolean onPreferenceClick(Preference preference) { mPrefs.deleteAccount(n); diff --git a/src/org/linphone/LinphonePreferences.java b/src/org/linphone/LinphonePreferences.java index 3897d3de2..9fe1c9f26 100644 --- a/src/org/linphone/LinphonePreferences.java +++ b/src/org/linphone/LinphonePreferences.java @@ -728,6 +728,11 @@ public class LinphonePreferences { } public void deleteAccount(int n) { + LinphoneAuthInfo authInfo = getAuthInfo(n); + if (authInfo != null) { + getLc().removeAuthInfo(authInfo); + } + LinphoneProxyConfig proxyCfg = getProxyConfig(n); if (proxyCfg != null) getLc().removeProxyConfig(proxyCfg); @@ -737,11 +742,6 @@ public class LinphonePreferences { getLc().setDefaultProxyConfig(null); } - LinphoneAuthInfo authInfo = getAuthInfo(n); - if (authInfo != null) { - getLc().removeAuthInfo(authInfo); - } - getLc().refreshRegisters(); } // End of accounts settings From e56f53bfa872c560faf9ba8cfae4d0b95da1615b Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Mon, 13 Jun 2016 12:08:55 +0200 Subject: [PATCH 02/14] Updated linphone to disable vfs for sqlite until all related issues are fixed --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index d8158669f..de2543d65 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit d8158669f356262a93034645f2bb14829127bba4 +Subproject commit de2543d65ca57d7b4a144ccd120fe5913bccf134 From af6015f26b67db99c9309765cb80e180c8d33533 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Mon, 13 Jun 2016 12:29:38 +0200 Subject: [PATCH 03/14] Updated linphone --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index de2543d65..f716330a5 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit de2543d65ca57d7b4a144ccd120fe5913bccf134 +Subproject commit f716330a56e1d4f4fcef141180fabb4d1e69aef6 From 3922a54543a2f085f1fbdf27e99cb474f625dc02 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Mon, 13 Jun 2016 12:41:32 +0200 Subject: [PATCH 04/14] Updated linphone to fix compil --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index f716330a5..e7eda74df 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit f716330a56e1d4f4fcef141180fabb4d1e69aef6 +Subproject commit e7eda74df980aaa21537a1fc720da579410cb4f6 From a3706aa9654a71c0d7d5e1ff76dbea96df1769f1 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Mon, 13 Jun 2016 14:44:14 +0200 Subject: [PATCH 05/14] Updated linphone --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index e7eda74df..311ddd603 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit e7eda74df980aaa21537a1fc720da579410cb4f6 +Subproject commit 311ddd603004af21a00f794c7e2e687e869d3a5d From 64e7f5f7f8c1803a51c7f47472774ed54a4938a0 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Thu, 16 Jun 2016 14:14:38 +0200 Subject: [PATCH 06/14] Update cmake-builder and cunit submodules. --- submodules/cmake-builder | 2 +- submodules/externals/cunit | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/submodules/cmake-builder b/submodules/cmake-builder index a4d728381..0245c8fa2 160000 --- a/submodules/cmake-builder +++ b/submodules/cmake-builder @@ -1 +1 @@ -Subproject commit a4d728381cf3eabb8ed4114807cea6628b675ab5 +Subproject commit 0245c8fa224e505103fbc8a50ae276ca5fb557aa diff --git a/submodules/externals/cunit b/submodules/externals/cunit index 2f096a862..efca65998 160000 --- a/submodules/externals/cunit +++ b/submodules/externals/cunit @@ -1 +1 @@ -Subproject commit 2f096a862f45b62426ffff2bef3badedd6eac42a +Subproject commit efca6599807bd800d740ecc02c2e0b72b912fc69 From 57e5892dd1af68e7c35dc41e4e6852e900b4127e Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Thu, 16 Jun 2016 14:14:56 +0200 Subject: [PATCH 07/14] Use 'RelWithDebInfo' build type instead of 'Release' when the debug option is not given. --- prepare.py | 1 + 1 file changed, 1 insertion(+) diff --git a/prepare.py b/prepare.py index 02229e4ef..2f3632089 100755 --- a/prepare.py +++ b/prepare.py @@ -80,6 +80,7 @@ class AndroidPreparator(prepare.Preparator): def __init__(self, targets=android_targets): prepare.Preparator.__init__(self, targets) + self.release_with_debug_info = True self.veryclean = True self.show_gpl_disclaimer = True self.argparser.add_argument('-ac', '--all-codecs', help="Enable all codecs, including the non-free ones", action='store_true') From 4867abe8a84170cdc1c17b0cedf7c535260f8baf Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Fri, 17 Jun 2016 14:25:39 +0200 Subject: [PATCH 08/14] Updated linphone --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index 311ddd603..3b22e0f8b 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 311ddd603004af21a00f794c7e2e687e869d3a5d +Subproject commit 3b22e0f8b99ed2abee85c2bc1675992750cf86c9 From fd0c0ef6db96befe57c35f00668fefb1f9e21fc4 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Fri, 17 Jun 2016 16:30:33 +0200 Subject: [PATCH 09/14] Updated c++ lib (from gnustl_static to c++_shared) --- liblinphone_tester/Makefile | 3 ++ prepare.py | 6 ++++ submodules/cmake-builder | 2 +- .../externals/build/cpplib/CMakeLists.txt | 31 +++++++++++++++++++ 4 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 submodules/externals/build/cpplib/CMakeLists.txt diff --git a/liblinphone_tester/Makefile b/liblinphone_tester/Makefile index 1754d87d3..1d2ca7715 100644 --- a/liblinphone_tester/Makefile +++ b/liblinphone_tester/Makefile @@ -14,6 +14,7 @@ copy-libs: mkdir -p assets/config_files if test -d "../liblinphone-sdk/android-arm"; then \ mkdir -p libs/armeabi && \ + cp -f ../liblinphone-sdk/android-arm/lib/libc++_shared.so libs/armeabi && \ cp -f ../liblinphone-sdk/android-arm/lib/lib*-armeabi.so libs/armeabi && \ cp -f ../liblinphone-sdk/android-arm/lib/mediastreamer/plugins/*.so libs/armeabi && \ cp -f ../liblinphone-sdk/android-arm/share/linphone/rootca.pem assets/config_files; \ @@ -25,6 +26,7 @@ copy-libs: rm -rf libs/armeabi-v7a if test -d "../liblinphone-sdk/android-armv7"; then \ mkdir -p libs/armeabi-v7a && \ + cp -f ../liblinphone-sdk/android-armv7/lib/libc++_shared.so libs/armeabi-v7a && \ cp -f ../liblinphone-sdk/android-armv7/lib/lib*-armeabi-v7a.so libs/armeabi-v7a && \ cp -f ../liblinphone-sdk/android-armv7/lib/mediastreamer/plugins/*.so libs/armeabi-v7a && \ cp -f ../liblinphone-sdk/android-armv7/share/linphone/rootca.pem assets/config_files; \ @@ -36,6 +38,7 @@ copy-libs: rm -rf libs/x86 if test -d "../liblinphone-sdk/android-x86"; then \ mkdir -p libs/x86 && \ + cp -f ../liblinphone-sdk/android-x86/lib/libc++_shared.so libs/x86 && \ cp -f ../liblinphone-sdk/android-x86/lib/lib*-x86.so libs/x86 && \ cp -f ../liblinphone-sdk/android-x86/lib/mediastreamer/plugins/*.so libs/x86 && \ cp -f ../liblinphone-sdk/android-x86/share/linphone/rootca.pem assets/config_files; \ diff --git a/prepare.py b/prepare.py index 2f3632089..4774b0a4f 100755 --- a/prepare.py +++ b/prepare.py @@ -160,9 +160,11 @@ copy-libs: \trm -rf libs/armeabi \tif test -d "liblinphone-sdk/android-arm"; then \\ \t\tmkdir -p libs-debug/armeabi && \\ +\t\tcp -f liblinphone-sdk/android-arm/lib/libc++_shared.so libs-debug/armeabi && \\ \t\tcp -f liblinphone-sdk/android-arm/lib/lib*-armeabi.so libs-debug/armeabi && \\ \t\tcp -f liblinphone-sdk/android-arm/lib/mediastreamer/plugins/*.so libs-debug/armeabi && \\ \t\tmkdir -p libs/armeabi && \\ +\t\tcp -f liblinphone-sdk/android-arm/lib/libc++_shared.so libs/armeabi && \\ \t\tcp -f liblinphone-sdk/android-arm/lib/lib*-armeabi.so libs/armeabi && \\ \t\tcp -f liblinphone-sdk/android-arm/lib/mediastreamer/plugins/*.so libs/armeabi && \\ \t\tsh WORK/android-arm/strip.sh libs/armeabi/*.so; \\ @@ -177,9 +179,11 @@ copy-libs: \trm -rf libs/armeabi-v7a \tif test -d "liblinphone-sdk/android-armv7"; then \\ \t\tmkdir -p libs-debug/armeabi-v7a && \\ +\t\tcp -f liblinphone-sdk/android-armv7/lib/libc++_shared.so libs-debug/armeabi-v7a && \\ \t\tcp -f liblinphone-sdk/android-armv7/lib/lib*-armeabi-v7a.so libs-debug/armeabi-v7a && \\ \t\tcp -f liblinphone-sdk/android-armv7/lib/mediastreamer/plugins/*.so libs-debug/armeabi-v7a && \\ \t\tmkdir -p libs/armeabi-v7a && \\ +\t\tcp -f liblinphone-sdk/android-armv7/lib/libc++_shared.so libs/armeabi-v7a && \\ \t\tcp -f liblinphone-sdk/android-armv7/lib/lib*-armeabi-v7a.so libs/armeabi-v7a && \\ \t\tcp -f liblinphone-sdk/android-armv7/lib/mediastreamer/plugins/*.so libs/armeabi-v7a && \\ \t\tsh WORK/android-armv7/strip.sh libs/armeabi-v7a/*.so; \\ @@ -194,9 +198,11 @@ copy-libs: \trm -rf libs/x86 \tif test -d "liblinphone-sdk/android-x86"; then \\ \t\tmkdir -p libs-debug/x86 && \\ +\t\tcp -f liblinphone-sdk/android-x86/lib/libc++_shared.so libs-debug/x86 && \\ \t\tcp -f liblinphone-sdk/android-x86/lib/lib*-x86.so libs-debug/x86 && \\ \t\tcp -f liblinphone-sdk/android-x86/lib/mediastreamer/plugins/*.so libs-debug/x86 && \\ \t\tmkdir -p libs/x86 && \\ +\t\tcp -f liblinphone-sdk/android-x86/lib/libc++_shared.so libs/x86 && \\ \t\tcp -f liblinphone-sdk/android-x86/lib/lib*-x86.so libs/x86 && \\ \t\tcp -f liblinphone-sdk/android-x86/lib/mediastreamer/plugins/*.so libs/x86 && \\ \t\tsh WORK/android-x86/strip.sh libs/x86/*.so; \\ diff --git a/submodules/cmake-builder b/submodules/cmake-builder index 0245c8fa2..e53fb56ca 160000 --- a/submodules/cmake-builder +++ b/submodules/cmake-builder @@ -1 +1 @@ -Subproject commit 0245c8fa224e505103fbc8a50ae276ca5fb557aa +Subproject commit e53fb56ca9ecc2477fc0c8bb482bf86564a464f0 diff --git a/submodules/externals/build/cpplib/CMakeLists.txt b/submodules/externals/build/cpplib/CMakeLists.txt new file mode 100644 index 000000000..b8748fca9 --- /dev/null +++ b/submodules/externals/build/cpplib/CMakeLists.txt @@ -0,0 +1,31 @@ +############################################################################ +# CMakeLists.txt +# Copyright (C) 2016 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +############################################################################ + +cmake_minimum_required(VERSION 3.0) +project(androidcpplib LANGUAGES NONE) + +include(GNUInstallDirs) + +install(FILES "${ANDROID_NDK_PATH}/sources/cxx-stl/llvm-libc++/libs/${CMAKE_SYSTEM_PROCESSOR}/libc++_shared.so" + DESTINATION ${CMAKE_INSTALL_LIBDIR} + PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE +) From 0977e41ea440ff6fe5616a0f500eb6980d6aa214 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Fri, 17 Jun 2016 18:26:09 +0200 Subject: [PATCH 10/14] Use the armv7 architecture to list the features with prepare.py. --- prepare.py | 3 +++ submodules/cmake-builder | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/prepare.py b/prepare.py index 4774b0a4f..d7954705b 100755 --- a/prepare.py +++ b/prepare.py @@ -110,6 +110,9 @@ class AndroidPreparator(prepare.Preparator): 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'] + def clean(self): prepare.Preparator.clean(self) if os.path.isfile('Makefile'): diff --git a/submodules/cmake-builder b/submodules/cmake-builder index e53fb56ca..0a9a7741c 160000 --- a/submodules/cmake-builder +++ b/submodules/cmake-builder @@ -1 +1 @@ -Subproject commit e53fb56ca9ecc2477fc0c8bb482bf86564a464f0 +Subproject commit 0a9a7741ce9a81ced5e7b8cf9caa61e43af83bcf From b635d2b38b4dfdf441329a0ed991e1db99d700a8 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Mon, 20 Jun 2016 13:13:34 +0200 Subject: [PATCH 11/14] Update cmake-builder and linphone submodules. --- submodules/cmake-builder | 2 +- submodules/linphone | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/submodules/cmake-builder b/submodules/cmake-builder index 0a9a7741c..08520b0cc 160000 --- a/submodules/cmake-builder +++ b/submodules/cmake-builder @@ -1 +1 @@ -Subproject commit 0a9a7741ce9a81ced5e7b8cf9caa61e43af83bcf +Subproject commit 08520b0ccb2628de41dde919b191415cac554f1d diff --git a/submodules/linphone b/submodules/linphone index 3b22e0f8b..e81293ab4 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 3b22e0f8b99ed2abee85c2bc1675992750cf86c9 +Subproject commit e81293ab4af60aa37c74d720b3f2da8f83d421e5 From 91e69fe220550b7c66e838df6eaa1860602be245 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Mon, 20 Jun 2016 13:32:51 +0200 Subject: [PATCH 12/14] Use gnustl c++ library instead of the llvm one that is not considered stable. --- prepare.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/prepare.py b/prepare.py index d7954705b..2e1b936e3 100755 --- a/prepare.py +++ b/prepare.py @@ -163,11 +163,11 @@ copy-libs: \trm -rf libs/armeabi \tif test -d "liblinphone-sdk/android-arm"; then \\ \t\tmkdir -p libs-debug/armeabi && \\ -\t\tcp -f liblinphone-sdk/android-arm/lib/libc++_shared.so libs-debug/armeabi && \\ +\t\tcp -f liblinphone-sdk/android-arm/lib/libgnustl_shared.so libs-debug/armeabi && \\ \t\tcp -f liblinphone-sdk/android-arm/lib/lib*-armeabi.so libs-debug/armeabi && \\ \t\tcp -f liblinphone-sdk/android-arm/lib/mediastreamer/plugins/*.so libs-debug/armeabi && \\ \t\tmkdir -p libs/armeabi && \\ -\t\tcp -f liblinphone-sdk/android-arm/lib/libc++_shared.so libs/armeabi && \\ +\t\tcp -f liblinphone-sdk/android-arm/lib/libgnustl_shared.so libs/armeabi && \\ \t\tcp -f liblinphone-sdk/android-arm/lib/lib*-armeabi.so libs/armeabi && \\ \t\tcp -f liblinphone-sdk/android-arm/lib/mediastreamer/plugins/*.so libs/armeabi && \\ \t\tsh WORK/android-arm/strip.sh libs/armeabi/*.so; \\ @@ -182,11 +182,11 @@ copy-libs: \trm -rf libs/armeabi-v7a \tif test -d "liblinphone-sdk/android-armv7"; then \\ \t\tmkdir -p libs-debug/armeabi-v7a && \\ -\t\tcp -f liblinphone-sdk/android-armv7/lib/libc++_shared.so libs-debug/armeabi-v7a && \\ +\t\tcp -f liblinphone-sdk/android-armv7/lib/libgnustl_shared.so libs-debug/armeabi-v7a && \\ \t\tcp -f liblinphone-sdk/android-armv7/lib/lib*-armeabi-v7a.so libs-debug/armeabi-v7a && \\ \t\tcp -f liblinphone-sdk/android-armv7/lib/mediastreamer/plugins/*.so libs-debug/armeabi-v7a && \\ \t\tmkdir -p libs/armeabi-v7a && \\ -\t\tcp -f liblinphone-sdk/android-armv7/lib/libc++_shared.so libs/armeabi-v7a && \\ +\t\tcp -f liblinphone-sdk/android-armv7/lib/libgnustl_shared.so libs/armeabi-v7a && \\ \t\tcp -f liblinphone-sdk/android-armv7/lib/lib*-armeabi-v7a.so libs/armeabi-v7a && \\ \t\tcp -f liblinphone-sdk/android-armv7/lib/mediastreamer/plugins/*.so libs/armeabi-v7a && \\ \t\tsh WORK/android-armv7/strip.sh libs/armeabi-v7a/*.so; \\ @@ -201,11 +201,11 @@ copy-libs: \trm -rf libs/x86 \tif test -d "liblinphone-sdk/android-x86"; then \\ \t\tmkdir -p libs-debug/x86 && \\ -\t\tcp -f liblinphone-sdk/android-x86/lib/libc++_shared.so libs-debug/x86 && \\ +\t\tcp -f liblinphone-sdk/android-x86/lib/libgnustl_shared.so libs-debug/x86 && \\ \t\tcp -f liblinphone-sdk/android-x86/lib/lib*-x86.so libs-debug/x86 && \\ \t\tcp -f liblinphone-sdk/android-x86/lib/mediastreamer/plugins/*.so libs-debug/x86 && \\ \t\tmkdir -p libs/x86 && \\ -\t\tcp -f liblinphone-sdk/android-x86/lib/libc++_shared.so libs/x86 && \\ +\t\tcp -f liblinphone-sdk/android-x86/lib/libgnustl_shared.so libs/x86 && \\ \t\tcp -f liblinphone-sdk/android-x86/lib/lib*-x86.so libs/x86 && \\ \t\tcp -f liblinphone-sdk/android-x86/lib/mediastreamer/plugins/*.so libs/x86 && \\ \t\tsh WORK/android-x86/strip.sh libs/x86/*.so; \\ From daa7f6423285008059da5dbf98009bffd57f8b55 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Tue, 21 Jun 2016 18:32:36 +0200 Subject: [PATCH 13/14] Check that Android NDK and Android SDK tools are installed + Check Android NDK version. --- prepare.py | 59 ++++++++++++++++++++++++++++++++++++++-- submodules/cmake-builder | 2 +- 2 files changed, 57 insertions(+), 4 deletions(-) diff --git a/prepare.py b/prepare.py index 2e1b936e3..f90dc1416 100755 --- a/prepare.py +++ b/prepare.py @@ -22,8 +22,11 @@ # ############################################################################ +import fnmatch import os +import re import sys +from distutils.spawn import find_executable from logging import error, warning, info from subprocess import Popen sys.dont_write_bytecode = True @@ -80,6 +83,9 @@ class AndroidPreparator(prepare.Preparator): def __init__(self, targets=android_targets): prepare.Preparator.__init__(self, targets) + self.min_supported_ndk = 10 + self.max_supported_ndk = 11 + self.unsupported_ndk_version = None self.release_with_debug_info = True self.veryclean = True self.show_gpl_disclaimer = True @@ -113,6 +119,53 @@ class AndroidPreparator(prepare.Preparator): def list_feature_target(self): return android_targets['armv7'] + def check_ndk_version(self): + retval = True + ndk_build = find_executable('ndk-build') + ndk_path = os.path.dirname(ndk_build) + # NDK prior to r11 had a RELEASE.TXT file holding the version number + release_file = os.path.join(ndk_path, 'RELEASE.TXT') + if os.path.isfile(release_file): + version = open(release_file).read().strip() + res = re.match('^r(\d+)(.*)$', version) + version = int(res.group(1)) + retval = False + else: + # Hack to find the NDK version since the RELEASE.TXT file is no longer there + python_config_files = [] + for root, dirnames, filenames in os.walk(ndk_path): + for filename in fnmatch.filter(filenames, 'python-config'): + python_config_files.append(os.path.join(root, filename)) + 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(1)) + retval = False + else: + error("Could not get Android NDK version!") + sys.exit(-1) + if retval == False and (version < self.min_supported_ndk or version > self.max_supported_ndk): + self.unsupported_ndk_version = version + retval = True + return retval + + def check_environment(self): + ret = 0 + ret_sdk = not self.check_is_installed('android', 'Android SDK tools') + ret_ndk = not self.check_is_installed('ndk-build', 'Android NDK r{}'.format(self.max_supported_ndk)) + if not ret_ndk: + ret_ndk = self.check_ndk_version() + ret |= ret_sdk + ret |= ret_ndk + ret |= prepare.Preparator.check_environment(self) + return ret + + def show_environment_errors(self): + if self.unsupported_ndk_version is not None: + error("Unsupported Android NDK r{}. Please install version r{}.".format(self.unsupported_ndk_version, self.max_supported_ndk)) + else: + prepare.Preparator.show_environment_errors(self) + def clean(self): prepare.Preparator.clean(self) if os.path.isfile('Makefile'): @@ -122,7 +175,7 @@ class AndroidPreparator(prepare.Preparator): if os.path.isdir('liblinphone-sdk') and not os.listdir('liblinphone-sdk'): os.rmdir('liblinphone-sdk') - def generate_makefile(self, generator): + def generate_makefile(self, generator, project_file=''): platforms = self.args.target arch_targets = "" for arch in platforms: @@ -313,8 +366,8 @@ help: help-prepare-options def main(): preparator = AndroidPreparator() preparator.parse_args() - if preparator.check_tools() != 0: - preparator.show_missing_dependencies() + if preparator.check_environment() != 0: + preparator.show_environment_errors() return 1 return preparator.run() diff --git a/submodules/cmake-builder b/submodules/cmake-builder index 08520b0cc..a4fbcbee4 160000 --- a/submodules/cmake-builder +++ b/submodules/cmake-builder @@ -1 +1 @@ -Subproject commit 08520b0ccb2628de41dde919b191415cac554f1d +Subproject commit a4fbcbee40e7c9b9ef3ec3f7b0e95e3440906d89 From 00d9751e34902afa394480d06c9cd929df6e58ad Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Fri, 24 Jun 2016 10:30:08 +0200 Subject: [PATCH 14/14] Fix liblinphone_tester Makefile. --- liblinphone_tester/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/liblinphone_tester/Makefile b/liblinphone_tester/Makefile index 1d2ca7715..c209ffefc 100644 --- a/liblinphone_tester/Makefile +++ b/liblinphone_tester/Makefile @@ -14,7 +14,7 @@ copy-libs: mkdir -p assets/config_files if test -d "../liblinphone-sdk/android-arm"; then \ mkdir -p libs/armeabi && \ - cp -f ../liblinphone-sdk/android-arm/lib/libc++_shared.so libs/armeabi && \ + cp -f ../liblinphone-sdk/android-arm/lib/libgnustl_shared.so libs/armeabi && \ cp -f ../liblinphone-sdk/android-arm/lib/lib*-armeabi.so libs/armeabi && \ cp -f ../liblinphone-sdk/android-arm/lib/mediastreamer/plugins/*.so libs/armeabi && \ cp -f ../liblinphone-sdk/android-arm/share/linphone/rootca.pem assets/config_files; \ @@ -26,7 +26,7 @@ copy-libs: rm -rf libs/armeabi-v7a if test -d "../liblinphone-sdk/android-armv7"; then \ mkdir -p libs/armeabi-v7a && \ - cp -f ../liblinphone-sdk/android-armv7/lib/libc++_shared.so libs/armeabi-v7a && \ + cp -f ../liblinphone-sdk/android-armv7/lib/libgnustl_shared.so libs/armeabi-v7a && \ cp -f ../liblinphone-sdk/android-armv7/lib/lib*-armeabi-v7a.so libs/armeabi-v7a && \ cp -f ../liblinphone-sdk/android-armv7/lib/mediastreamer/plugins/*.so libs/armeabi-v7a && \ cp -f ../liblinphone-sdk/android-armv7/share/linphone/rootca.pem assets/config_files; \ @@ -38,7 +38,7 @@ copy-libs: rm -rf libs/x86 if test -d "../liblinphone-sdk/android-x86"; then \ mkdir -p libs/x86 && \ - cp -f ../liblinphone-sdk/android-x86/lib/libc++_shared.so libs/x86 && \ + cp -f ../liblinphone-sdk/android-x86/lib/libgnustl_shared.so libs/x86 && \ cp -f ../liblinphone-sdk/android-x86/lib/lib*-x86.so libs/x86 && \ cp -f ../liblinphone-sdk/android-x86/lib/mediastreamer/plugins/*.so libs/x86 && \ cp -f ../liblinphone-sdk/android-x86/share/linphone/rootca.pem assets/config_files; \