configure.ac | 6 +++---
distro-configs/Jenkins/android_common.conf | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit b8e51e8a26b8b8faf63e457ba0c03651dd864d95
Author: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
AuthorDate: Tue Feb 18 16:57:39 2025 +0100
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Thu Feb 20 16:29:05 2025 +0100
bump android ndk to 27.2.12479018 on CI
Change-Id: I087e3e1aa8f7136bc020769a4d30c5e5ce9dbe3b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/181851
Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/distro-configs/Jenkins/android_common.conf
b/distro-configs/Jenkins/android_common.conf
index 5d3e57ede557..ec8100e1f2d6 100644
--- a/distro-configs/Jenkins/android_common.conf
+++ b/distro-configs/Jenkins/android_common.conf
@@ -1,5 +1,5 @@
--with-android-sdk=$HOME/Android/Sdk
---with-android-ndk=$HOME/Android/Sdk/ndk/25.1.8937393
+--with-android-ndk=$HOME/Android/Sdk/ndk/27.2.12479018
--with-jdk-home=/etc/alternatives/java_sdk_17
--enable-android-editing
--enable-odk
commit 886798ee04f39c124f541549db18ec74ad886643
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Wed Feb 19 14:34:15 2025 +0100
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Thu Feb 20 16:28:52 2025 +0100
tdf#162769 android: Declare support for NDK versions up to 28
With previous commits
Change-Id: Icd45abee58e13a2fc77d78d12e823a8045272b4f
Author: Michael Weghorn <m.wegh...@posteo.de>
Date: Wed Feb 19 13:44:55 2025 +0100
android: Drop linker flag for libandroid_support
and
Change-Id: I759c5213b5f5873fc097a6ca0e0f0f85962e421b
Author: Michael Weghorn <m.wegh...@posteo.de>
Date: Wed Feb 19 14:00:33 2025 +0100
tdf#162769 android nss/nspr: Drop '-D_PR_NO_LARGE_FILES=1'
, Android Viewer builds with NDK versions up to the latest
version 28.0.13004108 now work fine, so add them to the list
of supported versions so autogen no longer warns when
they are used.
Change-Id: I210a2783e88898e58031826c21f09349f5217a2e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/181900
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
diff --git a/configure.ac b/configure.ac
index c38c158ad8d2..3b29f6061ad8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -783,11 +783,11 @@ if test -n "$with_android_ndk"; then
11.1.*|12.1.*|13.1.*|14.1.*|16.*|17.*|18.*|19.*|20.*|21.*|22.*)
AC_MSG_ERROR([Building for Android requires NDK version >= 23.*])
;;
- 23.*|24.*|25.*)
+ 23.*|24.*|25.*|26.*|27.*|28.*)
;;
*)
- AC_MSG_WARN([Untested Android NDK version $ANDROID_NDK_VERSION, only
versions 23.* to 25.* have been used successfully. Proceed at your own risk.])
- add_warning "Untested Android NDK version $ANDROID_NDK_VERSION, only
versions 23.* to 25.* have been used successfully. Proceed at your own risk."
+ AC_MSG_WARN([Untested Android NDK version $ANDROID_NDK_VERSION, only
versions 23.* to 28.* have been used successfully. Proceed at your own risk.])
+ add_warning "Untested Android NDK version $ANDROID_NDK_VERSION, only
versions 23.* to 28.* have been used successfully. Proceed at your own risk."
;;
esac
