diff options
| author | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2021-03-19 10:33:55 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-04-14 10:42:36 +0000 |
| commit | f9e34126c101354d6002d340a8df9751ec07e234 (patch) | |
| tree | 6b0165c556caf1ef62a374af36dada93691ab94d | |
| parent | 974d7bc8054c3b5b6c01748cb1d2bc3fe75e9dfc (diff) | |
Update NDK to r22b
Qt quick 3D apps crash because of a bug caused by NDK r21
https://github.com/android/ndk/issues/1148, NDK r22b solves
the problem.
Task-number: QTBUG-91782
Task-number: QTBUG-92075
Change-Id: I92098c26f3bd9fcfc342ced42c9a81f1e34af8d6
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 53fc7d424d7a7c074645a1d2bcdad3840804b943)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
6 files changed, 8 insertions, 8 deletions
diff --git a/coin/provisioning/common/linux/android_linux.sh b/coin/provisioning/common/linux/android_linux.sh index 1de737d8..71436864 100755 --- a/coin/provisioning/common/linux/android_linux.sh +++ b/coin/provisioning/common/linux/android_linux.sh @@ -53,13 +53,13 @@ basePath="http://ci-files01-hki.intra.qt.io/input/android" toolsVersion="2.1" toolsFile="commandlinetools-linux-6609375_latest.zip" -ndkVersion="r21d" +ndkVersion="r22b" ndkFile="android-ndk-$ndkVersion-linux-x86_64.zip" sdkBuildToolsVersion="29.0.3" sdkApiLevel="android-29" toolsSha1="9172381ff070ee2a416723c1989770cf4b0d1076" -ndkSha1="bcf4023eb8cb6976a4c7cff0a8a8f145f162bf4d" +ndkSha1="9ece64c7f19763dd67320d512794969930fce9dc" toolsTargetFile="/tmp/$toolsFile" toolsSourceFile="$basePath/$toolsFile" diff --git a/coin/provisioning/common/windows/android-openssl.ps1 b/coin/provisioning/common/windows/android-openssl.ps1 index 14d9af28..e580b6df 100644 --- a/coin/provisioning/common/windows/android-openssl.ps1 +++ b/coin/provisioning/common/windows/android-openssl.ps1 @@ -54,7 +54,7 @@ $destination = "C:\Utils\openssl-android-master" $prebuilt_url = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\openssl-android-master-$version.zip" # msys unix style paths -$ndkPath = "/c/Utils/Android/android-ndk-r21d" +$ndkPath = "/c/Utils/Android/android-ndk-r22b" $openssl_path = "/c/Utils/openssl-android-master" $cc_path = "$ndkPath/toolchains/llvm/prebuilt/windows-x86_64/bin" if ((Test-Path $prebuilt_url)) { diff --git a/coin/provisioning/common/windows/android.ps1 b/coin/provisioning/common/windows/android.ps1 index 951a598d..b37b045a 100644 --- a/coin/provisioning/common/windows/android.ps1 +++ b/coin/provisioning/common/windows/android.ps1 @@ -40,10 +40,10 @@ # That's why we need to use Andoid-21 API version in Qt 5.9. # NDK -$ndkVersion = "r21d" +$ndkVersion = "r22b" $ndkCachedUrl = "\\ci-files01-hki.intra.qt.io\provisioning\android\android-ndk-$ndkVersion-windows-x86_64.zip" $ndkOfficialUrl = "https://dl.google.com/android/repository/android-ndk-$ndkVersion-windows-x86_64.zip" -$ndkChecksum = "99175ce1210258f2280568cd340e0666c69955c7" +$ndkChecksum = "96ba1a049303cf6bf3ee84cfd64d6bcd43486a50" $ndkFolder = "c:\Utils\Android\android-ndk-$ndkVersion" $ndkZip = "c:\Windows\Temp\android_ndk_$ndkVersion.zip" diff --git a/coin/provisioning/qtci-macos-10.14-x86_64/30-android.sh b/coin/provisioning/qtci-macos-10.14-x86_64/30-android.sh index 094dc356..6c999522 100755 --- a/coin/provisioning/qtci-macos-10.14-x86_64/30-android.sh +++ b/coin/provisioning/qtci-macos-10.14-x86_64/30-android.sh @@ -51,7 +51,7 @@ toolsVersion="2.1" # toolsFile dertermines tools version toolsFile="commandlinetools-mac-6609375_latest.zip" -ndkVersion="r21d" +ndkVersion="r22b" ndkFile="android-ndk-$ndkVersion-darwin-x86_64.zip" sdkBuildToolsVersion="28.0.3" # this is compile sdk version 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 094dc356..6c999522 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 @@ -51,7 +51,7 @@ toolsVersion="2.1" # toolsFile dertermines tools version toolsFile="commandlinetools-mac-6609375_latest.zip" -ndkVersion="r21d" +ndkVersion="r22b" ndkFile="android-ndk-$ndkVersion-darwin-x86_64.zip" sdkBuildToolsVersion="28.0.3" # this is compile sdk version diff --git a/coin/provisioning/qtci-macos-11.0-x86_64/30-android.sh b/coin/provisioning/qtci-macos-11.0-x86_64/30-android.sh index 094dc356..6c999522 100755 --- a/coin/provisioning/qtci-macos-11.0-x86_64/30-android.sh +++ b/coin/provisioning/qtci-macos-11.0-x86_64/30-android.sh @@ -51,7 +51,7 @@ toolsVersion="2.1" # toolsFile dertermines tools version toolsFile="commandlinetools-mac-6609375_latest.zip" -ndkVersion="r21d" +ndkVersion="r22b" ndkFile="android-ndk-$ndkVersion-darwin-x86_64.zip" sdkBuildToolsVersion="28.0.3" # this is compile sdk version |