diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-12-22 21:37:24 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-12-22 21:37:24 +0100 |
| commit | 1bba397539edbfb6a4212fe0cafbeb4ca703666a (patch) | |
| tree | a2cdfde9c0132d6ad68ba32d5fe46ef7a91343f2 /coin/provisioning/qtci-macos-10.12-x86_64/030-android.sh | |
| parent | a4adb7f7d66fed4b633bac15df8f9651503288ef (diff) | |
| parent | de0d7005ccff69ef1ea4c3ad42a2bf4033e26429 (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/002-zypperpackages.sh
Change-Id: I5aaf8fa93f7a9f06e30b9730703e8d1e018cb1f7
Diffstat (limited to 'coin/provisioning/qtci-macos-10.12-x86_64/030-android.sh')
| -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 |