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 /bridges/Library_cpp_uno.mk | |
| parent | lokdialog: No modal mode in LOK (diff) | |
| download | core-4082a18406c18af7b4fcef7bd501c3679c3be56b.tar.gz core-4082a18406c18af7b4fcef7bd501c3679c3be56b.zip | |
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 'bridges/Library_cpp_uno.mk')
| -rw-r--r-- | bridges/Library_cpp_uno.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/bridges/Library_cpp_uno.mk b/bridges/Library_cpp_uno.mk index 22ce084178b6..b64b97e6f22b 100644 --- a/bridges/Library_cpp_uno.mk +++ b/bridges/Library_cpp_uno.mk @@ -199,6 +199,7 @@ endif # it off. ifeq ($(COM),GCC) $(eval $(call gb_Library_add_cxxflags,gcc3_uno,\ + $(if $(filter armeabi-v7a,$(ANDROID_APP_ABI)),-I$(ANDROID_BINUTILS_PREBUILT_ROOT)/lib/gcc/arm-linux-androideabi/4.9.x/include) \ -fno-omit-frame-pointer \ -fno-strict-aliasing \ $(if $(filter TRUE,$(ENABLE_LTO)),-fno-lto) \ |