README.md | 2 +- configure.ac | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-)
New commits: commit 2b68bf57789714bf79b5bd1fc3e4e9ad586b7c31 Author: Michael Weghorn <m.wegh...@posteo.de> AuthorDate: Thu Feb 20 16:41:21 2025 +0100 Commit: Michael Weghorn <m.wegh...@posteo.de> CommitDate: Thu Feb 20 18:23:38 2025 +0100 android: Update minimum NDK version to 27 As discussed in today's ESC meeting [1], bump the minimum NDK version for Android builds from 23 to 27, which is used in CI since commit b8e51e8a26b8b8faf63e457ba0c03651dd864d95 Author: Christian Lohmaier <lohmaier+libreoff...@googlemail.com> Date: Tue Feb 18 16:57:39 2025 +0100 bump android ndk to 27.2.12479018 on CI and has better support for C++20 features. [1] https://lists.freedesktop.org/archives/libreoffice/2025-February/093032.html Change-Id: Ib7d7d355868ef38e7b92a5067ac0045a3b3f494c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/181956 Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.wegh...@posteo.de> diff --git a/README.md b/README.md index 4aaea53e5df2..f1ec093287fa 100644 --- a/README.md +++ b/README.md @@ -47,7 +47,7 @@ run and compile LibreOffice, also used by the TDF builds: * Runtime: 11.4 (only support for newer i devices == 64 bit) * Build: Xcode 9.3 and iPhone SDK 11.4 * Android: - * Build: NDK r23 and SDK 30.0.3 + * Build: NDK 27 and SDK 30.0.3 * Emscripten / WASM: * Runtime: a browser with SharedMemory support (threads + atomics) * Build: Qt 5.15 with Qt supported Emscripten 1.39.8 diff --git a/configure.ac b/configure.ac index 352255fbbce6..5ffe6c7f847b 100644 --- a/configure.ac +++ b/configure.ac @@ -771,16 +771,16 @@ if test -n "$with_android_ndk"; then fi case $ANDROID_NDK_VERSION in r9*|r10*) - AC_MSG_ERROR([Building for Android requires NDK version >= 23.*]) + AC_MSG_ERROR([Building for Android requires NDK version >= 27.*]) ;; - 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.*]) + 11.1.*|12.1.*|13.1.*|14.1.*|16.*|17.*|18.*|19.*|20.*|21.*|22.*|23.*|24.*|25.*|26.*) + AC_MSG_ERROR([Building for Android requires NDK version >= 27.*]) ;; - 23.*|24.*|25.*|26.*|27.*|28.*) + 27.*|28.*) ;; *) - 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." + AC_MSG_WARN([Untested Android NDK version $ANDROID_NDK_VERSION, only versions 27.* to 28.* have been used successfully. Proceed at your own risk.]) + add_warning "Untested Android NDK version $ANDROID_NDK_VERSION, only versions 27.* to 28.* have been used successfully. Proceed at your own risk." ;; esac