summaryrefslogtreecommitdiff
path: root/distro-configs
diff options
context:
space:
mode:
authorMichael Weghorn <m.weghorn@posteo.de>2023-01-25 11:14:52 +0100
committerMichael Weghorn <m.weghorn@posteo.de>2023-02-16 20:33:07 +0000
commita6b369c59a97dbbde40233d3ce5467a09131d079 (patch)
tree6f3bc0060187c446e0003f2c8c390aa1a59a0147 /distro-configs
parent7fe6f298131386d80349f2fe46b1f69d31fd4af9 (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 'distro-configs')
-rw-r--r--distro-configs/Jenkins/android_common.conf2
1 files changed, 1 insertions, 1 deletions
diff --git a/distro-configs/Jenkins/android_common.conf b/distro-configs/Jenkins/android_common.conf
index c5489f36c3e4..54af74b3450a 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/23.2.8568313
+--with-android-ndk=$HOME/Android/Sdk/ndk/25.1.8937393
--with-jdk-home=/etc/alternatives/java_sdk_11
--enable-android-editing
CC_FOR_BUILD=/opt/rh/devtoolset-7/root/usr/bin/gcc