diff options
| author | Heikki Halmet <heikki.halmet@qt.io> | 2019-01-17 15:24:27 +0200 |
|---|---|---|
| committer | Heikki Halmet <heikki.halmet@qt.io> | 2019-04-01 11:42:49 +0000 |
| commit | c09135cb56e03dd6a09b79f2c6e15932e9433df2 (patch) | |
| tree | 83789a4207439b2af27c1e3ad6bb7b0de64e5cd0 | |
| parent | 7eeee0df436c9b7422e91c43a89de5fdef8a102a (diff) | |
Provisioning: Update Android NDK to version r19
Also let's start using 64-bit Android NDK for Windows
Task-number: QTQAINFRA-2568
Change-Id: I2d757aa9e43abf5118abad7bf644e17e88a2ca94
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| -rwxr-xr-x | coin/provisioning/common/linux/android_linux.sh | 4 | ||||
| -rw-r--r-- | coin/provisioning/common/windows/android.ps1 | 10 | ||||
| -rwxr-xr-x | coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh | 4 |
3 files changed, 9 insertions, 9 deletions
diff --git a/coin/provisioning/common/linux/android_linux.sh b/coin/provisioning/common/linux/android_linux.sh index c77af943..a15bcf03 100755 --- a/coin/provisioning/common/linux/android_linux.sh +++ b/coin/provisioning/common/linux/android_linux.sh @@ -51,13 +51,13 @@ basePath="http://ci-files01-hki.intra.qt.io/input/android" toolsVersion="r26.1.1" toolsFile="sdk-tools-linux-4333796.zip" -ndkVersion="r18b" +ndkVersion="r19c" ndkFile="android-ndk-$ndkVersion-linux-x86_64.zip" sdkBuildToolsVersion="28.0.3" sdkApiLevel="android-28" toolsSha1="8c7c28554a32318461802c1291d76fccfafde054" -ndkSha1="500679655da3a86aecf67007e8ab230ea9b4dd7b" +ndkSha1="fd94d0be6017c6acbd193eb95e09cf4b6f61b834" toolsTargetFile="/tmp/$toolsFile" toolsSourceFile="$basePath/$toolsFile" diff --git a/coin/provisioning/common/windows/android.ps1 b/coin/provisioning/common/windows/android.ps1 index 1b4dd35d..def09116 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 = "r18b" -$ndkCachedUrl = "\\ci-files01-hki.intra.qt.io\provisioning\android\android-ndk-$ndkVersion-windows-x86.zip" -$ndkOfficialUrl = "https://dl.google.com/android/repository/android-ndk-$ndkVersion-windows-x86.zip" -$ndkChecksum = "4b8b6a4edc0fa967b429c1d6d25adf69acc28803" +$ndkVersion = "r19c" +$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 = "c4cd8c0b6e7618ca0a871a5f24102e40c239f6a3" $ndkFolder = "c:\Utils\Android\android-ndk-$ndkVersion" $ndkZip = "c:\Windows\Temp\android_ndk_$ndkVersion.zip" @@ -98,7 +98,7 @@ Out-File -FilePath C:\Utils\Android\licenses\android-sdk-license -Encoding utf8 cd $toolsFolder\bin\ $sdkmanager_args += "platforms;$sdkApiLevel", "platform-tools", "build-tools;$sdkBuildToolsVersion" $command = 'for($i=0;$i -lt 6;$i++) { $response += "y`n"}; $response | .\sdkmanager.bat @sdkmanager_args' -iex $command +Invoke-Expression $command $command = 'for($i=0;$i -lt 6;$i++) { $response += "y`n"}; $response | .\sdkmanager.bat --licenses' iex $command cmd /c "dir C:\Utils\android" diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh b/coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh index 9d7467ef..97df7e57 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh @@ -51,14 +51,14 @@ toolsVersion="r26.1.1" # toolsFile dertermines tools version toolsFile="sdk-tools-darwin-4333796.zip" -ndkVersion="r18b" +ndkVersion="r19c" ndkFile="android-ndk-$ndkVersion-darwin-x86_64.zip" sdkBuildToolsVersion="28.0.3" # this is compile sdk version sdkApiLevel="android-28" toolsSha1="ed85ea7b59bc3483ce0af4c198523ba044e083ad" -ndkSha1="98cb9909aa8c2dab32db188bbdc3ac6207e09440" +ndkSha1="f46b8193109bba8a58e0461c1a48f4534051fb25" toolsTargetFile="/tmp/$toolsFile" toolsSourceFile="$basePath/$toolsFile" |