From 60ff30b6b6b65586040aff5d6dbcbe90b7ca0b33 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Wed, 1 Jun 2016 12:34:00 +0200 Subject: [PATCH] Update submodules + Build android support library. --- submodules/bctoolbox | 2 +- submodules/belle-sip | 2 +- submodules/cmake-builder | 2 +- .../externals/build/support/CMakeLists.txt | 43 +++++++++++++++++++ submodules/linphone | 2 +- 5 files changed, 47 insertions(+), 4 deletions(-) create mode 100644 submodules/externals/build/support/CMakeLists.txt diff --git a/submodules/bctoolbox b/submodules/bctoolbox index 8852ed3a2..a7eead409 160000 --- a/submodules/bctoolbox +++ b/submodules/bctoolbox @@ -1 +1 @@ -Subproject commit 8852ed3a237697606f4ffa355edf2a9ed6326640 +Subproject commit a7eead409521583203b82a827adead9954c1a1d6 diff --git a/submodules/belle-sip b/submodules/belle-sip index ae856fa95..e2ef0e3bb 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit ae856fa959a93ca6a9abc9b37cf27100cbf2a60d +Subproject commit e2ef0e3bbf544a3a9483e6c07a56133040e5ddd5 diff --git a/submodules/cmake-builder b/submodules/cmake-builder index 5486c673d..1c9f7d7ad 160000 --- a/submodules/cmake-builder +++ b/submodules/cmake-builder @@ -1 +1 @@ -Subproject commit 5486c673de95cef2eeb700c420c99d1a97544318 +Subproject commit 1c9f7d7ad71b327dcffb9663b5190db49cc6407e diff --git a/submodules/externals/build/support/CMakeLists.txt b/submodules/externals/build/support/CMakeLists.txt new file mode 100644 index 000000000..3da596552 --- /dev/null +++ b/submodules/externals/build/support/CMakeLists.txt @@ -0,0 +1,43 @@ +############################################################################ +# 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(androidsupport LANGUAGES C) + +include(GNUInstallDirs) + + +set(SUPPORT_SOURCES + "${ANDROID_SUPPORT}/src/musl-locale/iconv.c" + "${ANDROID_SUPPORT}/src/musl-locale/langinfo.c" + "${ANDROID_SUPPORT}/src/musl-locale/nl_langinfo_l.c" + "${ANDROID_SUPPORT}/src/musl-multibyte/wctomb.c" +) + +add_library(support STATIC ${SUPPORT_SOURCES}) + +install(TARGETS support + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE +) diff --git a/submodules/linphone b/submodules/linphone index e4c674c2e..fad94bc04 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit e4c674c2e3887063aa2c73163c748acccd5fd12b +Subproject commit fad94bc04ca0f551b5470f1210a28042d20c7623