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

Update NDK to r22b

Browse Source 
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 53fc7d424d)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Assam Boudjelthia
2021-03-19 10:33:55 +02:00
committed by Qt Cherry-pick Bot
parent 2b9697ed7f
commit 27dbfe6607
6 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
coin/provisioning/common/linux/android_linux.sh
View File

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

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

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

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

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

2
coin/provisioning/qtci-macos-10.14-x86_64/30-android.sh
View File

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

2
coin/provisioning/qtci-macos-10.15-x86_64/30-android.sh
View File

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

2
coin/provisioning/qtci-macos-11.0-x86_64/30-android.sh
View File

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