diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-10-05 12:47:24 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-10-05 12:47:24 +0200 |
| commit | 1099b1ddcef203df81d4d19cecba8b2813d413d7 (patch) | |
| tree | 0abc9f9cee5fa597a8d8bb3ebf64cd9ba6b9d06e /coin/provisioning/qtci-linux-RHEL-6.6-x86_64/android_linux.sh | |
| parent | cdab32be2368ffd234c9ace4233916cfc3682563 (diff) | |
| parent | 9a096e6841e38c79fa3c81036e5d8c5b1e792e5c (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
.gitmodules
coin/platform_configs/qt5.txt
Change-Id: I4dee3bb4aab69430fc013ce509e20b7a9b9e4f47
Diffstat (limited to 'coin/provisioning/qtci-linux-RHEL-6.6-x86_64/android_linux.sh')
| -rw-r--r-- | coin/provisioning/qtci-linux-RHEL-6.6-x86_64/android_linux.sh | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/android_linux.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/android_linux.sh index 37b8c4be..fb8679f2 100644 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/android_linux.sh +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/android_linux.sh @@ -87,7 +87,13 @@ function InstallAndroidPackage { sudo rm -fr "$targetFolder"/"$version" } -sudo mkdir "$targetFolder" +if [ -d "$targetFolder" ]; then + echo "Removing old Android installation" + sudo rm -fr "$targetFolder" || ( echo "Can't remove $targetFolder" ; exit 1; ) +fi + +sudo mkdir "$targetFolder" || ( echo "Can't create $targetFolder" ; exit 1; ) + # Install Android SDK echo "Installing Android SDK version $sdkPackage..." InstallAndroidPackage "$targetFolder" $sdkPackage $sdkUrl $sdkSha1 $sdkTargetFile "$sdkExtract" $sdkFolderName $sdkName |