diff options
| author | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2017-11-22 23:08:06 +0100 |
|---|---|---|
| committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2018-01-18 14:44:25 +0100 |
| commit | 4082a18406c18af7b4fcef7bd501c3679c3be56b (patch) | |
| tree | 761952db6eea1fc3fab672a8d739562eaf1fb031 /external/liborcus | |
| parent | 0e8d0fe001ceecea95ad7115b835527e13252a17 (diff) | |
android: use unified headers and llvm-c++ STL (x86) with NDK 16
gnustl (and others) are to be removed in future versions of the ndk
also bump gradle and build-tools to current versions along with it
arm unfortunately crashes with llvm-c++, so keep with gnustl for now/fix
that later
Change-Id: Ic794c3293b599b77ec48096bf3283a99c09cbb79
Reviewed-on: https://gerrit.libreoffice.org/45163
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Diffstat (limited to 'external/liborcus')
| -rw-r--r-- | external/liborcus/ExternalProject_liborcus.mk | 2 | ||||
| -rw-r--r-- | external/liborcus/UnpackedTarball_liborcus.mk | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/external/liborcus/ExternalProject_liborcus.mk b/external/liborcus/ExternalProject_liborcus.mk index 01c7c050d04a..928c78e3a267 100644 --- a/external/liborcus/ExternalProject_liborcus.mk +++ b/external/liborcus/ExternalProject_liborcus.mk @@ -44,7 +44,7 @@ else liborcus_LIBS+=-L$(gb_StaticLibrary_WORKDIR) -lboost_system -lboost_iostreams -lboost_filesystem endif ifeq ($(OS),ANDROID) -liborcus_LIBS+=-lgnustl_shared -lm +liborcus_LIBS+=$(gb_STDLIBS) endif liborcus_CPPCLAGS=$(CPPFLAGS) diff --git a/external/liborcus/UnpackedTarball_liborcus.mk b/external/liborcus/UnpackedTarball_liborcus.mk index e9270c24a5cb..0dc6627de4a2 100644 --- a/external/liborcus/UnpackedTarball_liborcus.mk +++ b/external/liborcus/UnpackedTarball_liborcus.mk @@ -26,7 +26,9 @@ $(eval $(call gb_UnpackedTarball_add_patches,liborcus,\ external/liborcus/windows-constants-hack.patch \ )) endif -ifeq ($(OS),ANDROID) + +# TODO: remove once switching arm to llvm-c++ +ifeq ($(ANDROID_APP_ABI),armeabi-v7a) $(eval $(call gb_UnpackedTarball_add_patches,liborcus,\ external/liborcus/android-workaround.patch \ )) |