From fd0c0ef6db96befe57c35f00668fefb1f9e21fc4 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Fri, 17 Jun 2016 16:30:33 +0200 Subject: [PATCH] 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 +)