lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-05-04 02:07:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add Android NDK r25b to nightly run

Browse Source 
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>
This commit is contained in:
Heikki Halmet
2022-10-20 06:19:01 +00:00
parent 6d046574d0
commit e24ac3b3ca
6 changed files with 86 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
coin/provisioning/common/windows/android-openssl.ps1
View File

@@ -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) {

8
coin/provisioning/common/windows/android.ps1
View File

@@ -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"