diff options
| author | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2019-08-07 12:06:25 +0200 |
|---|---|---|
| committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2019-08-08 15:59:29 +0200 |
| commit | a7f6338875931d8afff55cb39ead8f6600af04cb (patch) | |
| tree | 0678222d12a0ddc8b328d758c3a76395f4d944af /solenv | |
| parent | bef93028584ab804d6daba4c4abcabfe6e58dc0f (diff) | |
android: support NDK 19 and above (20 as of this commit)
support for targeting API 14 and 15 was removed in NDK 18, so set
minimum version to 16
mips support was removed in NDK 17
Clang now takes care about correct linking with libc++ shared or
static, so don't manually specify them anymore.
Same with __ANDROID_API_LEVEL__ define and the sysroot / isystem
handling, that is all covered by a single -target <triple><version>
simplifying things quite a bit.
also align ownloud sdk values with main build.gradle
Change-Id: Ib3ae4484e52214677e826270b731ecf7c5c15445
Reviewed-on: https://gerrit.libreoffice.org/77104
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/platform/ANDROID_GODSON_GCC.mk | 17 | ||||
| -rw-r--r-- | solenv/gbuild/platform/android.mk | 9 |
2 files changed, 1 insertions, 25 deletions
diff --git a/solenv/gbuild/platform/ANDROID_GODSON_GCC.mk b/solenv/gbuild/platform/ANDROID_GODSON_GCC.mk deleted file mode 100644 index 0eb4f0a96e48..000000000000 --- a/solenv/gbuild/platform/ANDROID_GODSON_GCC.mk +++ /dev/null @@ -1,17 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# - -# please make generic modifications to unxgcc.mk or android.mk -gb_CPUDEFS += -DMIPS -gb_COMPILEROPTFLAGS := -Os - -include $(GBUILDDIR)/platform/unxgcc.mk -include $(GBUILDDIR)/platform/android.mk - -# vim: set noet sw=4: diff --git a/solenv/gbuild/platform/android.mk b/solenv/gbuild/platform/android.mk index 572a7c5b1028..3c25314639e1 100644 --- a/solenv/gbuild/platform/android.mk +++ b/solenv/gbuild/platform/android.mk @@ -9,14 +9,7 @@ ifeq ($(DISABLE_DYNLOADING),TRUE) -gb_STDLIBS := \ - -lc++_static \ - -lc++abi \ - -landroid_support \ - -else - -gb_STDLIBS := -lc++_shared +gb_STDLIBS := -static-libstdc++ endif |