mirror of
git://code.qt.io/qt/qt5.git
synced 2026-04-22 21:06:53 +08:00
Provisioning: Update Android NDK to LTS version r27c
This patch updates Android NDK from LTS r26b to LTS r27c.
The version is 27.2.12479018
Task-number: QTQAINFRA-6479
Task-number: QTQAINFRA-6655
Pick-to: 6.8 6.5
Change-Id: Ic791cfd5d5dd2a439f96590b6f6f8ca0ac4fb5ae
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Reviewed-by: Rami Potinkara <rami.potinkara@qt.io>
(cherry picked from commit a242bb2e3e)
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
This commit is contained in:
@@ -16,11 +16,11 @@ if (Is64BitWinHost) {
|
||||
# More info and building instructions can be found from http://doc.qt.io/qt-5/opensslsupport.html
|
||||
|
||||
$openssl_version = "3.0.7"
|
||||
$ndk_version_latest = "r26b"
|
||||
$ndk_version_latest = "r27c"
|
||||
$ndk_version_default = "$ndk_version_latest"
|
||||
$openssl_compressed = Get-DownloadLocation ("openssl-${openssl_version}.tar.gz")
|
||||
$openssl_sha1 = "f20736d6aae36bcbfa9aba0d358c71601833bf27"
|
||||
$prebuilt_sha1_ndk_latest = "ea925d5a5b696916fb3650403a2eb3189c52b5ce"
|
||||
$prebuilt_sha1_ndk_latest = "733cff853b6ee7738e78b90f46b5f028c8490e1e"
|
||||
$prebuilt_sha1_ndk_default = "$prebuilt_sha1_ndk_latest"
|
||||
$destination_prefix = "C:\Utils\prebuilt-openssl-${openssl_version}-for-android-ndk"
|
||||
|
||||
@@ -70,7 +70,7 @@ function Install($1, $2) {
|
||||
}
|
||||
|
||||
# ANDROID_NDK_ROOT needs to be in environment variables before running this script
|
||||
# Set-EnvironmentVariable "ANDROID_NDK_ROOT" "C:\Utils\Android\android-ndk-r26b"
|
||||
# Set-EnvironmentVariable "ANDROID_NDK_ROOT" "C:\Utils\Android\android-ndk-r27c"
|
||||
|
||||
$make_install = Start-Process -NoNewWindow -Wait -PassThru -ErrorAction Stop -FilePath "$msys_bash" -ArgumentList ("-lc", "`"yes | pacman -S make`"")
|
||||
CheckExitCode $make_install
|
||||
|
||||
@@ -10,9 +10,9 @@
|
||||
# That's why we need to use Andoid-21 API version in Qt 5.9.
|
||||
|
||||
# NDK
|
||||
$ndkVersionLatest = "r26b"
|
||||
$ndkVersionLatest = "r27c"
|
||||
$ndkVersionDefault = $ndkVersionLatest
|
||||
$ndkChecksumLatest = "17453c61a59e848cffb8634f2c7b322417f1732e"
|
||||
$ndkChecksumLatest = "ac5f7762764b1f15341094e148ad4f847d050c38"
|
||||
$ndkChecksumDefault = $ndkChecksumLatest
|
||||
$ndkCachedUrlLatest = "\\ci-files01-hki.ci.qt.io\provisioning\android\android-ndk-$ndkVersionLatest-windows.zip"
|
||||
$ndkOfficialUrlLatest = "https://dl.google.com/android/repository/android-ndk-$ndkVersionLatest-windows.zip"
|
||||
|
||||
@@ -144,7 +144,7 @@ function InstallAndroidArmv7 {
|
||||
$target_cpu="armv7-a"
|
||||
$api_version="24"
|
||||
|
||||
$ndkVersionLatest = "r26b"
|
||||
$ndkVersionLatest = "r27c"
|
||||
$ndkFolderLatest = "/c/Utils/Android/android-ndk-$ndkVersionLatest"
|
||||
|
||||
$toolchain="${ndkFolderLatest}/toolchains/llvm/prebuilt/windows-x86_64"
|
||||
|
||||
Reference in New Issue
Block a user