diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-08-22 08:22:02 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-08-22 08:22:02 +0200 |
| commit | 74eb853384473dbe18123f9731b6f9529d68d2cf (patch) | |
| tree | af5f2be1057f4a80f331bb5d81caa0af6c35aac8 /coin/provisioning/qtci-windows-7-x86/06-android.ps1 | |
| parent | c2493f9d6dcd0bdcf028dfce9b7b8f6356fa9eea (diff) | |
| parent | 5df417aeb9fe5fa8b8613abdd3b32bc79e32f49e (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.9
Move the Documentation feature to the corresponding Ubuntu 16.04, where
the CI would have used it by magic.
Conflicts:
coin/platform_configs/default.txt
coin/platform_configs/qt5.txt
Done-with: Frederik Gladhorn<frederik.gladhorn@qt.io>
Change-Id: I885ce572710480cd15ecdc8cfac7edb52957f92a
Diffstat (limited to 'coin/provisioning/qtci-windows-7-x86/06-android.ps1')
| -rw-r--r-- | coin/provisioning/qtci-windows-7-x86/06-android.ps1 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/coin/provisioning/qtci-windows-7-x86/06-android.ps1 b/coin/provisioning/qtci-windows-7-x86/06-android.ps1 index 23d98847..5dcc21ac 100644 --- a/coin/provisioning/qtci-windows-7-x86/06-android.ps1 +++ b/coin/provisioning/qtci-windows-7-x86/06-android.ps1 @@ -8,7 +8,7 @@ # NDK $ndkVersion = "r10e" -$ndkCachedUrl = "\\ci-files01-hki.ci.local\provisioning\android\android-ndk-$ndkVersion-windows-x86.zip" +$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 = "1d0b8f2835be741f3048fb03c0a3e9f71ab7f357" $ndkFolder = "c:\utils\android-ndk-$ndkVersion" @@ -19,7 +19,7 @@ $sdkVersion = "r24.4.1" $sdkApi = "ANDROID_API_VERSION" $sdkApiLevel = "android-21" $sdkBuildToolsVersion = "23.0.3" -$sdkCachedUrl= "\\ci-files01-hki.ci.local\provisioning\android\android-sdk_$sdkVersion-windows.zip" +$sdkCachedUrl= "\\ci-files01-hki.intra.qt.io\provisioning\android\android-sdk_$sdkVersion-windows.zip" $sdkOfficialUrl = "https://dl.google.com/android/android-sdk_$sdkVersion-windows.zip" $sdkChecksum = "66b6a6433053c152b22bf8cab19c0f3fef4eba49" $sdkFolder = "c:\utils\android-sdk-windows" |