Merge branch 'master' into dev_group_chat

AndroidManifest.xml

@@ -2,8 +2,8 @@
 <manifest package="org.linphone"
           xmlns:android="http://schemas.android.com/apk/res/android"
           android:installLocation="auto"
-          android:versionCode="3311"
-          android:versionName="3.3.1">
+          android:versionCode="3320"
+          android:versionName="3.3.2">
 
     <uses-sdk
         android:minSdkVersion="16"

AndroidManifestLibrary.xml

@@ -2,8 +2,8 @@
 <manifest package="org.linphone.core"
           xmlns:android="http://schemas.android.com/apk/res/android"
           android:installLocation="auto"
-          android:versionCode="3311"
-          android:versionName="3.3.1">
+          android:versionCode="3320"
+          android:versionName="3.3.2">
 
     <uses-sdk
         android:minSdkVersion="16"

cmake_builder/CMakeLists.txt

@@ -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")
+

prepare.py

@@ -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):

submodules/cmake-builder

@@ -1 +1 @@
-Subproject commit 2fdbbd7afc7d3c48ad56708e913aec4ea5b5fcba
+Subproject commit bd973554739e1e991a8726e6a9b80ba0e78950fa