diff --git a/coin/provisioning/common/linux/android_linux.sh b/coin/provisioning/common/linux/android_linux.sh index 60e81e9f..d6850239 100755 --- a/coin/provisioning/common/linux/android_linux.sh +++ b/coin/provisioning/common/linux/android_linux.sh @@ -61,13 +61,13 @@ basePath="http://ci-files01-hki.intra.qt.io/input/android" toolsVersion="2.1" toolsFile="commandlinetools-linux-6609375_latest.zip" -ndkVersionLatest="r23b" +ndkVersionLatest="r25b" ndkVersionDefault=$ndkVersionLatest sdkBuildToolsVersion="31.0.0" sdkApiLevel="android-31" toolsSha1="9172381ff070ee2a416723c1989770cf4b0d1076" -ndkSha1Latest="f47ec4c4badd11e9f593a8450180884a927c330d" +ndkSha1Latest="e27dcb9c8bcaa77b78ff68c3f23abcf6867959eb" ndkSha1Default=$ndkSha1Latest # Android automotive sdkApiLevelAutomovie="android-30" diff --git a/coin/provisioning/common/macos/android.sh b/coin/provisioning/common/macos/android.sh index 1efb8ee0..cef1aee5 100755 --- a/coin/provisioning/common/macos/android.sh +++ b/coin/provisioning/common/macos/android.sh @@ -57,7 +57,7 @@ toolsVersion="2.1" # toolsFile dertermines tools version toolsFile="commandlinetools-mac-6609375_latest.zip" -ndkVersionLatest="r23b" +ndkVersionLatest="r25b" ndkVersionDefault="$ndkVersionLatest" sdkBuildToolsVersion="31.0.0" # this is compile sdk version diff --git a/coin/provisioning/common/unix/openssl_for_android.sh b/coin/provisioning/common/unix/openssl_for_android.sh index 35a9ad6c..0d9fdc25 100755 --- a/coin/provisioning/common/unix/openssl_for_android.sh +++ b/coin/provisioning/common/unix/openssl_for_android.sh @@ -39,7 +39,7 @@ ## ############################################################################# -# This script install prebuilt OpenSSL which was built against Android NDK 21. +# This script install prebuilt OpenSSL which was built against Android NDK 25. # OpenSSL build will fail with Android NDK 22, because it's missing platforms and sysroot directories set -ex @@ -49,14 +49,14 @@ source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh" source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" version="1.1.1m" -ndkVersionLatest="r23b" +ndkVersionLatest="r25b" ndkVersionDefault=$ndkVersionLatest -prebuiltOpensslNdkShaDarwinLatest="2624b0c2772e360bbbae7a7f2dc342e4b97f1a2e" -prebuiltOpensslNdkShaLinuxLatest="f58dcb32b2d3e5edc7e5141ae139a50547805f60" +prebuiltOpensslNdkShaDarwinLatest="1f4f994255c39839c8857d2ed1ff58a2101de714" +prebuiltOpensslNdkShaLinuxLatest="15f7014781186a23f4973a719b55b766b1e69116" prebuiltOpensslNdkShaDarwinDefault=$prebuiltOpensslNdkShaDarwinLatest prebuiltOpensslNdkShaLinuxDefault=$prebuiltOpensslNdkShaLinuxLatest -: ' 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. diff --git a/coin/provisioning/common/windows/android-openssl.ps1 b/coin/provisioning/common/windows/android-openssl.ps1 index d260ef52..baef0635 100644 --- a/coin/provisioning/common/windows/android-openssl.ps1 +++ b/coin/provisioning/common/windows/android-openssl.ps1 @@ -52,11 +52,11 @@ 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_latest = "r25b" $ndk_version_default = "$ndk_version_latest" $openssl_compressed = Get-DownloadLocation ("openssl-${openssl_version}_fixes-ndk_root.tar.gz") $openssl_sha1 = "c9638d25b9709eda1ac52591c0993af52d6d1206" -$prebuilt_sha1_ndk_latest = "0aebe55d2436f235e1a24ae9d1030cb6ce8f31da" +$prebuilt_sha1_ndk_latest = "2897c84dccdb26e15b467e4a63de025fe7038899" $prebuilt_sha1_ndk_default = "$prebuilt_sha1_ndk_latest" $destination = "C:\Utils\openssl-android-master" diff --git a/coin/provisioning/common/windows/android.ps1 b/coin/provisioning/common/windows/android.ps1 index cd989170..baeb6f1b 100644 --- a/coin/provisioning/common/windows/android.ps1 +++ b/coin/provisioning/common/windows/android.ps1 @@ -46,9 +46,9 @@ # That's why we need to use Andoid-21 API version in Qt 5.9. # NDK -$ndkVersionLatest = "r23b" +$ndkVersionLatest = "r25b" $ndkVersionDefault = $ndkVersionLatest -$ndkChecksumLatest = "6e3fb50022c611a2b13d02f5de5c21cc7206a298" +$ndkChecksumLatest = "b2e9b5ab2e1434a65ffd85780891878cf5c6fd92" $ndkChecksumDefault = $ndkChecksumLatest $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" diff --git a/coin/provisioning/qtci-macos-10.15-x86_64/30-android.sh b/coin/provisioning/qtci-macos-10.15-x86_64/30-android.sh index 770b5d0c..a73fa364 100755 --- a/coin/provisioning/qtci-macos-10.15-x86_64/30-android.sh +++ b/coin/provisioning/qtci-macos-10.15-x86_64/30-android.sh @@ -57,7 +57,7 @@ toolsVersion="2.1" # toolsFile dertermines tools version toolsFile="commandlinetools-mac-6609375_latest.zip" -ndkVersion="r23b" +ndkVersion="r25b" ndkFile="android-ndk-$ndkVersion-darwin.zip" sdkBuildToolsVersion="31.0.0" # this is compile sdk version diff --git a/coin/provisioning/qtci-macos-11-arm/30-android.sh b/coin/provisioning/qtci-macos-11-arm/30-android.sh index f8a5074c..2139fc01 100755 --- a/coin/provisioning/qtci-macos-11-arm/30-android.sh +++ b/coin/provisioning/qtci-macos-11-arm/30-android.sh @@ -57,7 +57,7 @@ toolsVersion="2.1" # toolsFile dertermines tools version toolsFile="commandlinetools-mac-6609375_latest.zip" -ndkVersion="r23b" +ndkVersion="r25b" ndkFile="android-ndk-$ndkVersion-darwin.zip" sdkBuildToolsVersion="28.0.3" # this is compile sdk version diff --git a/coin/provisioning/qtci-macos-11-x86_64/30-android.sh b/coin/provisioning/qtci-macos-11-x86_64/30-android.sh index 770b5d0c..a73fa364 100755 --- a/coin/provisioning/qtci-macos-11-x86_64/30-android.sh +++ b/coin/provisioning/qtci-macos-11-x86_64/30-android.sh @@ -57,7 +57,7 @@ toolsVersion="2.1" # toolsFile dertermines tools version toolsFile="commandlinetools-mac-6609375_latest.zip" -ndkVersion="r23b" +ndkVersion="r25b" ndkFile="android-ndk-$ndkVersion-darwin.zip" sdkBuildToolsVersion="31.0.0" # this is compile sdk version diff --git a/coin/provisioning/qtci-macos-12-arm/30-android.sh b/coin/provisioning/qtci-macos-12-arm/30-android.sh index 6ddbf928..1d268576 100755 --- a/coin/provisioning/qtci-macos-12-arm/30-android.sh +++ b/coin/provisioning/qtci-macos-12-arm/30-android.sh @@ -57,7 +57,7 @@ toolsVersion="2.1" # toolsFile dertermines tools version toolsFile="commandlinetools-mac-6609375_latest.zip" -ndkVersion="r23b" +ndkVersion="r25b" ndkFile="android-ndk-$ndkVersion-darwin.zip" sdkBuildToolsVersion="28.0.3" # this is compile sdk version diff --git a/coin/provisioning/qtci-macos-13-arm/30-android.sh b/coin/provisioning/qtci-macos-13-arm/30-android.sh index 6ddbf928..1d268576 100755 --- a/coin/provisioning/qtci-macos-13-arm/30-android.sh +++ b/coin/provisioning/qtci-macos-13-arm/30-android.sh @@ -57,7 +57,7 @@ toolsVersion="2.1" # toolsFile dertermines tools version toolsFile="commandlinetools-mac-6609375_latest.zip" -ndkVersion="r23b" +ndkVersion="r25b" ndkFile="android-ndk-$ndkVersion-darwin.zip" sdkBuildToolsVersion="28.0.3" # this is compile sdk version