diff options
| author | Simo Fält <simo.falt@qt.io> | 2017-12-20 08:08:01 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-12-22 15:22:27 +0000 |
| commit | de0d7005ccff69ef1ea4c3ad42a2bf4033e26429 (patch) | |
| tree | cdcac7e3b432c7f643ed49e0e152cc108f2f702d /coin/provisioning/qtci-macos-10.12-x86_64 | |
| parent | 88a1c161e5e61a369518833a1283c9fb7a76b1d9 (diff) | |
Fix Android provisioning script
We have to accept extra license to enable installing all required
packages.
Task-number: QTQAINFRA-1660
Change-Id: I9d014991be96ff0723688b317a645e281b3e92d0
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit 5df4ec2ec999440ba291f2bf2f9fa6b72810660d)
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 | 2 |
1 files changed, 1 insertions, 1 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 e041027d..bc8a95e6 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 @@ -77,7 +77,7 @@ try sudo chown -R qt:wheel "$targetFolder" echo "Running SDK manager for platforms;$sdkApiLevel, tools, platform-tools and build-tools;$sdkBuildToolsVersion." - echo "y" |"$sdkTargetFolder/tools/bin/sdkmanager" "platforms;$sdkApiLevel" "tools" "platform-tools" "build-tools;$sdkBuildToolsVersion" || throw $ExceptionSdkManager + (echo "y"; echo "y") |"$sdkTargetFolder/tools/bin/sdkmanager" "platforms;$sdkApiLevel" "tools" "platform-tools" "build-tools;$sdkBuildToolsVersion" || throw $ExceptionSdkManager echo "export ANDROID_SDK_HOME=$sdkTargetFolder" >> ~/.bashrc echo "export ANDROID_NDK_HOME=$targetFolder/android-ndk-$ndkVersion" >> ~/.bashrc |