Add Android NDK r25b to nightly run

Task-number: QTQAINFRA-4990 Change-Id: I002777b8add830e48c62d46ea8d885a9bc14ff83 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2026-01-10 00:46:41 +08:00 · 2022-10-20 06:19:01 +00:00
parent 6d046574d0
commit e24ac3b3ca
6 changed files with 86 additions and 21 deletions
--- a/coin/platform_configs/nightly_cmake_platforms_target_android_latest.yaml
+++ b/coin/platform_configs/nightly_cmake_platforms_target_android_latest.yaml
@@ -0,0 +1,65 @@
+Version: 2
+Configurations:
+-
+    Id: 'android-arm64-on-macos'
+    Template: 'qtci-macos-12-x86_64-105'
+    Target os: 'Android_ANY'
+    Target arch: 'arm64'
+    Compiler: 'Clang'
+    Target compiler: 'Clang'
+    Platform dependency: 'macos-latest-xcode-universal-packaging-build'
+    Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure']
+    Environment variables: [
+        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_LATEST}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis arm64-v8a',
+        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_LATEST}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
+        'CONAN_HOST_PROFILE=coin/conan/profiles/ci-macos-universal-clang',
+        'CONAN_PROFILE=coin/conan/profiles/ci-unix-android-arm64-clang',
+        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_LATEST}}'
+    ]
+-
+    Template: 'qtci-windows-10_21H2-x86_64-51'
+    Target os: 'Android_ANY'
+    Target arch: 'armv7'
+    Compiler: 'Mingw'
+    Target compiler: 'Clang'
+    Platform dependency: 'Windows10_21H2-Mingw11-x64-host'
+    Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure']
+    Environment variables: [
+        'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}',
+        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_LATEST}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis armeabi-v7a -no-feature-pkg-config',
+        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_LATEST}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
+        'CONAN_HOST_PROFILE=coin/conan/profiles/ci-windows-x86_64-mingw',
+        'CONAN_PROFILE=coin/conan/profiles/ci-windows-android-armv7-clang',
+        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_LATEST}}'
+    ]
+-
+    Template: 'qtci-linux-RHEL-8.4-x86_64-50'
+    Target os: 'Android_ANY'
+    Target arch: 'x86'
+    Compiler: 'GCC'
+    Target compiler: 'Clang'
+    Platform dependency: 'RHEL-8.4-host'
+    Features: ['Packaging', 'Sccache', 'AndroidTestRun', 'VMSize8', 'UseConfigure']
+    Environment variables: [
+        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_LATEST}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86',
+        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_LATEST}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
+        'CONAN_HOST_PROFILE=coin/conan/profiles/ci-linux-x86_64-gcc',
+        'CONAN_PROFILE=coin/conan/profiles/ci-unix-android-x86-clang',
+        'ANDROID_EMULATOR=@emulator_x86_api_23',
+        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_LATEST}}'
+    ]
+-
+    Template: 'qtci-linux-RHEL-8.4-x86_64-50'
+    Target os: 'Android_ANY'
+    Target arch: 'x86_64'
+    Compiler: 'GCC'
+    Target compiler: 'Clang'
+    Platform dependency: 'RHEL-8.4-host'
+    Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure']
+    Environment variables: [
+        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_LATEST}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86_64',
+        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_LATEST}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
+        'CONAN_HOST_PROFILE=coin/conan/profiles/ci-linux-x86_64-gcc',
+        'CONAN_PROFILE=coin/conan/profiles/ci-unix-android-x86_64-clang',
+        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_LATEST}}'
+    ]
--- a/coin/provisioning/common/linux/android_linux.sh
+++ b/coin/provisioning/common/linux/android_linux.sh
@@ -61,14 +61,14 @@ basePath="http://ci-files01-hki.intra.qt.io/input/android"

 toolsVersion="2.1"
 toolsFile="commandlinetools-linux-6609375_latest.zip"
-ndkVersionLatest="r23b"
-ndkVersionDefault=$ndkVersionLatest
+ndkVersionLatest="r25b"
+ndkVersionDefault="r23b"
 sdkBuildToolsVersion="31.0.0"
 sdkApiLevel="android-31"

 toolsSha1="9172381ff070ee2a416723c1989770cf4b0d1076"
-ndkSha1Latest="f47ec4c4badd11e9f593a8450180884a927c330d"
-ndkSha1Default=$ndkSha1Latest
+ndkSha1Latest="e27dcb9c8bcaa77b78ff68c3f23abcf6867959eb"
+ndkSha1Default="f47ec4c4badd11e9f593a8450180884a927c330d"
 # Android automotive
 sdkApiLevelAutomovie="android-30"
 androidAutomotive11Url="$basePath/${sdkApiLevelAutomovie}_automotive.tar.gz"
--- a/coin/provisioning/common/macos/android.sh
+++ b/coin/provisioning/common/macos/android.sh
@@ -57,8 +57,8 @@ toolsVersion="2.1"
 # toolsFile dertermines tools version
 toolsFile="commandlinetools-mac-6609375_latest.zip"

-ndkVersionLatest="r23b"
-ndkVersionDefault="$ndkVersionLatest"
+ndkVersionLatest="r25b"
+ndkVersionDefault="r23b"
 sdkBuildToolsVersion="31.0.0"
 # this is compile sdk version
 sdkApiLevel="android-31"
--- a/coin/provisioning/common/unix/openssl_for_android.sh
+++ b/coin/provisioning/common/unix/openssl_for_android.sh
@@ -49,14 +49,14 @@ source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"

 version="1.1.1m"
-ndkVersionLatest="r23b"
-ndkVersionDefault=$ndkVersionLatest
-prebuiltOpensslNdkShaDarwinLatest="2624b0c2772e360bbbae7a7f2dc342e4b97f1a2e"
-prebuiltOpensslNdkShaLinuxLatest="f58dcb32b2d3e5edc7e5141ae139a50547805f60"
-prebuiltOpensslNdkShaDarwinDefault=$prebuiltOpensslNdkShaDarwinLatest
-prebuiltOpensslNdkShaLinuxDefault=$prebuiltOpensslNdkShaLinuxLatest
+ndkVersionLatest="r25b"
+ndkVersionDefault="r23b"
+prebuiltOpensslNdkShaDarwinLatest="1f4f994255c39839c8857d2ed1ff58a2101de714"
+prebuiltOpensslNdkShaLinuxLatest="15f7014781186a23f4973a719b55b766b1e69116"
+prebuiltOpensslNdkShaDarwinDefault="2624b0c2772e360bbbae7a7f2dc342e4b97f1a2e"
+prebuiltOpensslNdkShaLinuxDefault="f58dcb32b2d3e5edc7e5141ae139a50547805f60"

-: ' SOURCE BUILD INSTRUCTIONS - Openssl prebuilt was made using Android NDK 21
+: ' SOURCE BUILD INSTRUCTIONS - Openssl prebuilt was made using Android NDK 25
 # Source built requires GCC and Perl to be in PATH.
 exports_file="/tmp/export.sh"
 # source previously made environmental variables.
--- a/coin/provisioning/common/windows/android-openssl.ps1
+++ b/coin/provisioning/common/windows/android-openssl.ps1
@@ -52,12 +52,12 @@ if (Is64BitWinHost) {
 # More info and building instructions can be found from http://doc.qt.io/qt-5/opensslsupport.html

 $openssl_version = "1.1.1m"
-$ndk_version_latest = "r23b"
-$ndk_version_default = "$ndk_version_latest"
+$ndk_version_latest = "r25b"
+$ndk_version_default = "r23b"
 $openssl_compressed = Get-DownloadLocation ("openssl-${openssl_version}_fixes-ndk_root.tar.gz")
 $openssl_sha1 = "c9638d25b9709eda1ac52591c0993af52d6d1206"
-$prebuilt_sha1_ndk_latest = "0aebe55d2436f235e1a24ae9d1030cb6ce8f31da"
-$prebuilt_sha1_ndk_default = "$prebuilt_sha1_ndk_latest"
+$prebuilt_sha1_ndk_latest = "2897c84dccdb26e15b467e4a63de025fe7038899"
+$prebuilt_sha1_ndk_default = "0aebe55d2436f235e1a24ae9d1030cb6ce8f31da"
 $destination = "C:\Utils\openssl-android-master"

 function Install($1, $2) {
--- a/coin/provisioning/common/windows/android.ps1
+++ b/coin/provisioning/common/windows/android.ps1
@@ -46,10 +46,10 @@
 # That's why we need to use Andoid-21 API version in Qt 5.9.

 # NDK
-$ndkVersionLatest = "r23b"
-$ndkVersionDefault = $ndkVersionLatest
-$ndkChecksumLatest = "6e3fb50022c611a2b13d02f5de5c21cc7206a298"
-$ndkChecksumDefault = $ndkChecksumLatest
+$ndkVersionLatest = "r25b"
+$ndkVersionDefault = "r23b"
+$ndkChecksumLatest = "b2e9b5ab2e1434a65ffd85780891878cf5c6fd92"
+$ndkChecksumDefault = "6e3fb50022c611a2b13d02f5de5c21cc7206a298"
 $ndkCachedUrlLatest = "\\ci-files01-hki.intra.qt.io\provisioning\android\android-ndk-$ndkVersionLatest-windows.zip"
 $ndkOfficialUrlLatest = "https://dl.google.com/android/repository/android-ndk-$ndkVersionLatest-windows.zip"
 $ndkCachedUrlDefault = "\\ci-files01-hki.intra.qt.io\provisioning\android\android-ndk-$ndkVersionDefault-windows.zip"