lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-03-18 02:06:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update NDK to r23b

Browse Source 
This also fixes Android OpenSSL installation

NDK update will be added only to dev and 6.3 branches

Task-number: QTQAINFRA-4837
Change-Id: I1233217e71f345d30f3dec83d7477d3c6e3b6c2d
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
This commit is contained in:
Heikki Halmet
2022-02-24 15:49:40 +02:00
committed by Assam Boudjelthia
parent 2ee43055ed
commit 789c276431
10 changed files with 33 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -59,13 +59,13 @@ basePath="http://ci-files01-hki.intra.qt.io/input/android"
toolsVersion="2.1"
toolsFile="commandlinetools-linux-6609375_latest.zip"
ndkVersion="r22b"
ndkFile="android-ndk-$ndkVersion-linux-x86_64.zip"
ndkVersion="r23b"
ndkFile="android-ndk-$ndkVersion-linux.zip"
sdkBuildToolsVersion="31.0.0"
sdkApiLevel="android-31"
toolsSha1="9172381ff070ee2a416723c1989770cf4b0d1076"
ndkSha1="9ece64c7f19763dd67320d512794969930fce9dc"
ndkSha1="f47ec4c4badd11e9f593a8450180884a927c330d"
# Android automotive
sdkApiLevelAutomovie="android-30"

8
coin/provisioning/common/unix/openssl_for_android.sh
View File

@@ -82,11 +82,11 @@ PATH=$TOOLCHAIN:$PATH CC=clang make build_generated
'
if uname -a |grep -q "Darwin"; then
prebuiltUrl="http://ci-files01-hki.intra.qt.io/input/openssl/prebuilt-openssl-1_1_1_m_for-android-ndk-21_darwin.tar.gz"
sha="d8c189f8a329263365c73bc471b6c9c68d117e3a"
prebuiltUrl="http://ci-files01-hki.intra.qt.io/input/openssl/prebuilt-openssl-1.1.1m-for-android-ndk-r23b-darwin.tar.gz"
sha="2624b0c2772e360bbbae7a7f2dc342e4b97f1a2e"
else
prebuiltUrl="http://ci-files01-hki.intra.qt.io/input/openssl/prebuilt-openssl-1_1_1_m_for-android-ndk-21.tar.gz"
sha="db028f25ca4d000fe2317c3abfdfa0c234833549"
prebuiltUrl="http://ci-files01-hki.intra.qt.io/input/openssl/prebuilt-openssl-1.1.1m-for-android-ndk-r23b-linux.tar.gz"
sha="f58dcb32b2d3e5edc7e5141ae139a50547805f60"
fi
targetFile="/tmp/prebuilt-openssl-$version.tar.gz"
DownloadURL "$prebuiltUrl" "$prebuiltUrl" "$sha" "$targetFile"

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

@@ -52,13 +52,13 @@ if (Is64BitWinHost) {
# More info and building instructions can be found from http://doc.qt.io/qt-5/opensslsupport.html
$version = "1.1.1m"
$ndk_version = "r22b"
$zip = Get-DownloadLocation ("openssl-$version.tar.gz")
$prebuilt_zip = Get-DownloadLocation ("prebuilt-openssl-${version}-fixes-ndk_root-windows.zip")
$ndk_version = "r23b"
$zip = Get-DownloadLocation ("openssl-${version}_fixes-ndk_root.tar.gz")
$prebuilt_zip = Get-DownloadLocation ("prebuilt-openssl-${version}-for-android-used-ndk-${ndk_version}-windows.zip")
$sha1 = "c9638d25b9709eda1ac52591c0993af52d6d1206"
$prebuilt_sha1 = "2bf5354b2264ed80e85fea3705ba434a38fe563e"
$prebuilt_sha1 = "0aebe55d2436f235e1a24ae9d1030cb6ce8f31da"
$destination = "C:\Utils\openssl-android-master"
$prebuilt_url = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\prebuilt-openssl-${version}-fixes-ndk_root-windows.zip"
$prebuilt_url = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\prebuilt-openssl-${version}-for-android-used-ndk-${ndk_version}-windows.zip"
# msys unix style paths
$ndkPath = "/c/Utils/Android/android-ndk-${ndk_version}"

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

@@ -1,6 +1,6 @@
############################################################################
##
## Copyright (C) 2020 The Qt Company Ltd.
## Copyright (C) 2022 The Qt Company Ltd.
## Contact: https://www.qt.io/licensing/
##
## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -46,10 +46,10 @@
# That's why we need to use Andoid-21 API version in Qt 5.9.
# NDK
$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 = "96ba1a049303cf6bf3ee84cfd64d6bcd43486a50"
$ndkVersion = "r23b"
$ndkCachedUrl = "\\ci-files01-hki.intra.qt.io\provisioning\android\android-ndk-$ndkVersion-windows.zip"
$ndkOfficialUrl = "https://dl.google.com/android/repository/android-ndk-$ndkVersion-windows.zip"
$ndkChecksum = "6e3fb50022c611a2b13d02f5de5c21cc7206a298"
$ndkFolder = "c:\Utils\Android\android-ndk-$ndkVersion"
$ndkZip = "c:\Windows\Temp\android_ndk_$ndkVersion.zip"

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

@@ -2,7 +2,7 @@
#############################################################################
##
## Copyright (C) 2020 The Qt Company Ltd.
## Copyright (C) 2022 The Qt Company Ltd.
## Contact: https://www.qt.io/licensing/
##
## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -57,8 +57,8 @@ toolsVersion="2.1"
# toolsFile dertermines tools version
toolsFile="commandlinetools-mac-6609375_latest.zip"
ndkVersion="r22b"
ndkFile="android-ndk-$ndkVersion-darwin-x86_64.zip"
ndkVersion="r23b"
ndkFile="android-ndk-$ndkVersion-darwin.zip"
sdkBuildToolsVersion="31.0.0"
# this is compile sdk version
sdkApiLevel="android-31"

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

@@ -2,7 +2,7 @@
#############################################################################
##
## Copyright (C) 2020 The Qt Company Ltd.
## Copyright (C) 2022 The Qt Company Ltd.
## Contact: https://www.qt.io/licensing/
##
## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -57,8 +57,8 @@ toolsVersion="2.1"
# toolsFile dertermines tools version
toolsFile="commandlinetools-mac-6609375_latest.zip"
ndkVersion="r22b"
ndkFile="android-ndk-$ndkVersion-darwin-x86_64.zip"
ndkVersion="r23b"
ndkFile="android-ndk-$ndkVersion-darwin.zip"
sdkBuildToolsVersion="31.0.0"
# this is compile sdk version
sdkApiLevel="android-31"

6
coin/provisioning/qtci-macos-11-x86_64/30-android.sh
View File

@@ -2,7 +2,7 @@
#############################################################################
##
## Copyright (C) 2020 The Qt Company Ltd.
## Copyright (C) 2022 The Qt Company Ltd.
## Contact: https://www.qt.io/licensing/
##
## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -57,8 +57,8 @@ toolsVersion="2.1"
# toolsFile dertermines tools version
toolsFile="commandlinetools-mac-6609375_latest.zip"
ndkVersion="r22b"
ndkFile="android-ndk-$ndkVersion-darwin-x86_64.zip"
ndkVersion="r23b"
ndkFile="android-ndk-$ndkVersion-darwin.zip"
sdkBuildToolsVersion="31.0.0"
# this is compile sdk version
sdkApiLevel="android-31"

6
coin/provisioning/qtci-macos-11.0-arm/30-android.sh
View File

@@ -2,7 +2,7 @@
#############################################################################
##
## Copyright (C) 2020 The Qt Company Ltd.
## Copyright (C) 2022 The Qt Company Ltd.
## Contact: https://www.qt.io/licensing/
##
## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -57,8 +57,8 @@ toolsVersion="2.1"
# toolsFile dertermines tools version
toolsFile="commandlinetools-mac-6609375_latest.zip"
ndkVersion="r21d"
ndkFile="android-ndk-$ndkVersion-darwin-x86_64.zip"
ndkVersion="r23b"
ndkFile="android-ndk-$ndkVersion-darwin.zip"
sdkBuildToolsVersion="28.0.3"
# this is compile sdk version
sdkApiLevel="android-28"

4
coin/provisioning/qtci-macos-12-x86_64/30-android.sh
View File

@@ -57,8 +57,8 @@ toolsVersion="2.1"
# toolsFile dertermines tools version
toolsFile="commandlinetools-mac-6609375_latest.zip"
ndkVersion="r22b"
ndkFile="android-ndk-$ndkVersion-darwin-x86_64.zip"
ndkVersion="r23b"
ndkFile="android-ndk-$ndkVersion-darwin.zip"
sdkBuildToolsVersion="31.0.0"
# this is compile sdk version
sdkApiLevel="android-31"

4
coin/provisioning/qtci-macos-12.0-arm/30-android.sh
View File

@@ -57,8 +57,8 @@ toolsVersion="2.1"
# toolsFile dertermines tools version
toolsFile="commandlinetools-mac-6609375_latest.zip"
ndkVersion="r21d"
ndkFile="android-ndk-$ndkVersion-darwin-x86_64.zip"
ndkVersion="r23b"
ndkFile="android-ndk-$ndkVersion-darwin.zip"
sdkBuildToolsVersion="28.0.3"
# this is compile sdk version
sdkApiLevel="android-28"