configure.ac | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 9e10d4cc278805738a0816b60fd076529f85e1a3
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Mon Jan 23 17:01:51 2023 +0100
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Wed Jan 25 10:35:19 2023 +0000
android: Don't warn about NDK 21 and 22
At least for these 2 configurations, building the app with
NDK 22.1.7171670 worked fine:
x86 dbgutil build:
--build=x86_64-unknown-linux-gnu
--with-android-ndk=/home/michi/Android/Sdk/ndk/22.1.7171670/
--with-android-sdk=/home/michi/Android/Sdk
--with-distro=LibreOfficeAndroidX86
--enable-sal-log
--with-external-tar=/home/michi/development/libreoffice-external
--enable-ccache
--enable-dbgutil
--with-jdk-home=/usr/lib/jvm/java-17-openjdk-amd64/
32-bit ARM release build:
--build=x86_64-unknown-linux-gnu
--with-android-ndk=/home/michi/Android/Sdk/ndk/22.1.7171670/
--with-android-sdk=/home/michi/Android/Sdk
--with-distro=LibreOfficeAndroid
--with-external-tar=/home/michi/development/libreoffice-external
--enable-ccache
--with-jdk-home=/usr/lib/jvm/java-11-openjdk-amd64/
--enable-release-build
Change-Id: I6c4d47b7e96232f44cb310badb18a8a30b585de8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146117
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/configure.ac b/configure.ac
index 921853e2f8b3..41518fdc533c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -706,11 +706,11 @@ if test -n "$with_android_ndk"; then
11.1.*|12.1.*|13.1.*|14.1.*)
AC_MSG_ERROR([Building for Android is only supported with NDK versions
above 16.x.*])
;;
- 16.*|17.*|18.*|19.*|20.*)
+ 16.*|17.*|18.*|19.*|20.*|21.*|22.*)
;;
*)
- AC_MSG_WARN([Untested Android NDK version $ANDROID_NDK_VERSION, only
versions 16.* til 20.* have been used successfully. Proceed at your own risk.])
- add_warning "Untested Android NDK version $ANDROID_NDK_VERSION, only
versions 16.* til 20.* have been used successfully. Proceed at your own risk."
+ AC_MSG_WARN([Untested Android NDK version $ANDROID_NDK_VERSION, only
versions 16.* to 22.* have been used successfully. Proceed at your own risk.])
+ add_warning "Untested Android NDK version $ANDROID_NDK_VERSION, only
versions 16.* to 22.* have been used successfully. Proceed at your own risk."
;;
esac
