diff options
| author | Michael Weghorn <m.weghorn@posteo.de> | 2023-01-25 11:14:52 +0100 |
|---|---|---|
| committer | Michael Weghorn <m.weghorn@posteo.de> | 2023-02-16 20:33:07 +0000 |
| commit | a6b369c59a97dbbde40233d3ce5467a09131d079 (patch) | |
| tree | 6f3bc0060187c446e0003f2c8c390aa1a59a0147 /configure.ac | |
| parent | 7fe6f298131386d80349f2fe46b1f69d31fd4af9 (diff) | |
android: Support NDK 24.x and 25.x, use NDK 25 for Jenkins
NDK 24 dropped support for API versions < 19,
quoting [1]:
> * Jelly Bean (APIs 16, 17, and 18) is no longer supported. The minimum OS
> supported by the NDK is KitKat (API level 19).
Therefore, use API level 19 for these (and unknown) NDKs unless
anything greater has explicitly been specified using the
`--with-android-api-level=<VERSION>` autogen switch
(or is default for the architecture, s. above).
Update the Jenkins config to use NDK 25 for the Android
builds as discussed in the ESC meeting on 2023-01-26 [2].
[1] https://developer.android.com/ndk/downloads/revision_history
[2] https://lists.freedesktop.org/archives/libreoffice/2023-January/089878.html
Change-Id: Ib8e65f433ee89ff1bc12432722570bf8f9f7ed85
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146135
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index a68d8efb52ba..a346bde17e87 100644 --- a/configure.ac +++ b/configure.ac @@ -741,8 +741,18 @@ if test -n "$with_android_ndk"; then 23.*) ;; *) - AC_MSG_WARN([Untested Android NDK version $ANDROID_NDK_VERSION, only versions 23.* have been used successfully. Proceed at your own risk.]) - add_warning "Untested Android NDK version $ANDROID_NDK_VERSION, only versions 23.* have been used successfully. Proceed at your own risk." + # NDK 24 dropped support for API levels < 19 + if test "$ANDROID_API_LEVEL" -lt "19"; then + ANDROID_API_LEVEL=19 + fi + case $ANDROID_NDK_VERSION in + 24.*|25.*) + ;; + *) + 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." + ;; + esac ;; esac |