summaryrefslogtreecommitdiffstats
path: root/coin/provisioning/common/linux/android_linux.sh
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2018-02-20 21:22:31 +0100
committerLiang Qi <liang.qi@qt.io>2018-02-20 22:33:59 +0100
commit91739f5fe3554f0c847346d6011e20de2a24f586 (patch)
tree6a6874edbd74692712480ad31bbd102fc2a9ce57 /coin/provisioning/common/linux/android_linux.sh
parentc64b2415d326f21119399b76549ef9de3195b538 (diff)
parente086fbc6cb80b089ed3e336a47e849fc1b5023ca (diff)
Merge remote-tracking branch 'origin/5.9' into 5.11
Conflicts: coin/provisioning/common/linux/open62541.sh coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh coin/provisioning/qtci-macos-10.12-x86_64/40-qnx700.sh Done-with: Maurice Kalinowski <maurice.kalinowski@qt.io> Change-Id: Icd472b8f770a933bafead48093ecf7eb94156128
Diffstat (limited to 'coin/provisioning/common/linux/android_linux.sh')
-rwxr-xr-xcoin/provisioning/common/linux/android_linux.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/coin/provisioning/common/linux/android_linux.sh b/coin/provisioning/common/linux/android_linux.sh
index 76db19d4..a7b83fd7 100755
--- a/coin/provisioning/common/linux/android_linux.sh
+++ b/coin/provisioning/common/linux/android_linux.sh
@@ -88,7 +88,7 @@ try
fi
echo "Running SDK manager for platforms;$sdkApiLevel, tools, platform-tools and build-tools;$sdkBuildToolsVersion."
- if [ "$proxy" != "" ]; then
+ if [ "$http_proxy" != "" ]; then
proxy_host=$(echo $proxy | cut -d'/' -f3 | cut -d':' -f1)
proxy_port=$(echo $proxy | cut -d':' -f3)
echo "y" |"$sdkTargetFolder/tools/bin/sdkmanager" --no_https --proxy=http --proxy_host=$proxy_host --proxy_port=$proxy_port "platforms;$sdkApiLevel" "tools" "platform-tools" "build-tools;$sdkBuildToolsVersion" || throw $ExceptionSdkManager