lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-04-22 12:56:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ensure 'clean' android Installation

Browse Source 
Remove old android installation and make sure new 'clean' android
folder is created.

Change-Id: I4c561797791e08976b07a194c2c9ed2f5aa302bb
Reviewed-by: Simo Fält <simo.falt@qt.io>
This commit is contained in:
Heikki Halmet
2017-09-15 10:26:29 +03:00
committed by Jani Heikkinen
parent b0a9259c6e
commit 12fd0d5b9b
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
coin/provisioning/qtci-linux-RHEL-6.6-x86_64/android_linux.sh
View File

@@ -87,7 +87,13 @@ function InstallAndroidPackage {
sudo rm -fr "$targetFolder"/"$version" 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 # Install Android SDK
echo "Installing Android SDK version $sdkPackage..." echo "Installing Android SDK version $sdkPackage..."
InstallAndroidPackage "$targetFolder" $sdkPackage $sdkUrl $sdkSha1 $sdkTargetFile "$sdkExtract" $sdkFolderName $sdkName InstallAndroidPackage "$targetFolder" $sdkPackage $sdkUrl $sdkSha1 $sdkTargetFile "$sdkExtract" $sdkFolderName $sdkName