diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-08-24 09:12:33 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-08-24 09:12:33 +0200 |
| commit | ebf8aa15e67caacab514ea93782ff0783d60af2d (patch) | |
| tree | ecbaf2c3669d1de878ead56e8b44a83bff65efdc /coin/provisioning/qtci-windows-7-x86/06-android.ps1 | |
| parent | d18d7aaa40cfd92279bec558e980ff6c58c49340 (diff) | |
| parent | dfaabde5dcbdecf24d24dce4172c976687085bb6 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
.gitmodules
coin/platform_configs/qt5.txt
coin/provisioning/common/system_updates.sh
coin/provisioning/qtci-linux-RHEL-7.2-x86_64/08-pythondev.sh
coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/08-pythondev.sh
coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/freeopcua.sh
coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/freeopcua.sh
coin/provisioning/qtci-macos-10.12-x86_64/020-xcode.sh
Change-Id: Id9c38f3cda85b82fc20fb4a1f2ec71aa18646d94
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" |