diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2017-04-25 12:37:26 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2017-04-25 12:37:26 +0200 |
| commit | 070d9333a6fc768526479edd2b81bba9e030f655 (patch) | |
| tree | eaa10c66dfbda182271344ec13770bb34cc679ca /coin/provisioning/qtci-macos-10.12-x86_64 | |
| parent | 9884a4e98e544a6b627b912a3bcaa477c0d29209 (diff) | |
| parent | 2ea45a59a72402ba65cb484020576aa12a610038 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.9
Conflicts:
coin/platform_configs/default.txt
coin/platform_configs/qt5.txt
coin/provisioning/qtci-osx-10.10-x86_64/android.sh
coin/provisioning/qtci-osx-10.11-x86_64/android.sh
Change-Id: I2c3ae694d05ffe502967595fc7c7cfc6ddae4d4d
Diffstat (limited to 'coin/provisioning/qtci-macos-10.12-x86_64')
| -rwxr-xr-x | coin/provisioning/qtci-macos-10.12-x86_64/030-android.sh | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/030-android.sh b/coin/provisioning/qtci-macos-10.12-x86_64/030-android.sh index e5ab2ced..c6a17530 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/030-android.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/030-android.sh @@ -39,14 +39,11 @@ # shellcheck source=../common/try_catch.sh source "${BASH_SOURCE%/*}/../common/try_catch.sh" -# shellcheck source=../common/DownloadURL.sh -source "${BASH_SOURCE%/*}/../common/DownloadURL.sh" targetFolder="/opt/android" sdkTargetFolder="$targetFolder/sdk" -baseUrl="http://ci-files01-hki.ci.local/input/android" -baseAltUrl="https://dl.google.com/android/repository/" +basePath="/net/ci-files01-hki.ci.local/hdd/www/input/android" toolsVersion="r25.2.5" toolsFile="tools_$toolsVersion-macosx.zip" @@ -58,13 +55,10 @@ sdkApiLevel="android-21" toolsSha1="d2168d963ac5b616e3d3ddaf21511d084baf3659" ndkSha1="6be8598e4ed3d9dd42998c8cb666f0ee502b1294" -toolsDlUrl="$baseUrl/$toolsFile" -ndkDlUrl="$baseUrl/$ndkFile" -toolsAltDlUrl="$baseAltUrl/$toolsFile" -ndkAltDlUrl="$baseAltUrl/$ndkFile" - toolsTargetFile="/tmp/$toolsFile" +toolsSourceFile="$basePath/$toolsFile" ndkTargetFile="/tmp/$ndkFile" +ndkSourceFile="$basePath/$ndkFile" ExceptionUnzipTools=100 ExceptionUnzipNdk=101 @@ -74,16 +68,10 @@ ExceptionSdkManager=104 try ( - DownloadURL "$toolsDlUrl" "$toolsAltDlUrl" "$toolsSha1" "$toolsTargetFile" - DownloadURL "$ndkDlUrl" "$ndkAltDlUrl" "$ndkSha1" "$ndkTargetFile" echo "Unzipping Android NDK to '$targetFolder'" - sudo unzip -q "$ndkTargetFile" -d "$targetFolder" || throw $ExceptionUnzipNdk + sudo unzip -q "$ndkSourceFile" -d "$targetFolder" || throw $ExceptionUnzipNdk echo "Unzipping Android Tools to '$sdkTargetFolder'" - sudo unzip -q "$toolsTargetFile" -d "$sdkTargetFolder" || throw $ExceptionUnzipTools - - echo "Removing temporary files." - rm "$toolsTargetFile" || throw $ExceptionRmTools - rm "$ndkTargetFile" || throw $ExceptionRmNdk + sudo unzip -q "$toolsSourceFile" -d "$sdkTargetFolder" || throw $ExceptionUnzipTools echo "Changing ownership of Android files." sudo chown -R qt:wheel "$targetFolder" |