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 /solenv/gbuild | |
| 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 'solenv/gbuild')
| -rw-r--r-- | solenv/gbuild/platform/android.mk | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/solenv/gbuild/platform/android.mk b/solenv/gbuild/platform/android.mk index ae1a9ea0b618..bc8ad996f8df 100644 --- a/solenv/gbuild/platform/android.mk +++ b/solenv/gbuild/platform/android.mk @@ -8,15 +8,26 @@ # ifeq ($(DISABLE_DYNLOADING),TRUE) -# Link with -lgnustl_static -gb_STDLIBS := \ - -lgnustl_static \ - -lm +ifeq ($(ANDROID_APP_ABI),armeabi-v7a) +# TODO: gnustl is deprecated/will be removed in future versions of the ndk +gb_STDLIBS := -lgnustl_static else -# Link almost everything with -lgnustl_shared gb_STDLIBS := \ - -lgnustl_shared \ + -lc++_static \ + -lc++abi \ + -landroid_support \ + +endif + +else + +ifeq ($(ANDROID_APP_ABI),armeabi-v7a) +# TODO: gnustl is deprecated/will be removed in future versions of the ndk +gb_STDLIBS := -lgnustl_shared +else +gb_STDLIBS := -lc++_shared +endif endif |