diff options
author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2017-02-01 21:04:15 +0100 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2017-02-01 21:04:15 +0100 |
commit | 2c1d5ad75440f2a8304dec385a63baf9d2e4ed36 (patch) | |
tree | 8e1e0361181d59aefbb635c8b34266f13b9c60ca /coin/provisioning/qtci-linux-RHEL-6.6-x86_64 | |
parent | 29a926f941c82ef54bc32149737d041f8b3fcb70 (diff) | |
parent | 07b72ae2c3a253f2095fed8c013d8e0d8fce6e00 (diff) |
Merge remote-tracking branch 'gerrit/dev' into 5.9
Diffstat (limited to 'coin/provisioning/qtci-linux-RHEL-6.6-x86_64')
-rw-r--r-- | coin/provisioning/qtci-linux-RHEL-6.6-x86_64/android_sdk_linux.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/android_sdk_linux.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/android_sdk_linux.sh index 6b8d59f1..a03a1660 100644 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/android_sdk_linux.sh +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/android_sdk_linux.sh @@ -35,7 +35,7 @@ # This script install Android sdk and ndk. -# It also runs update for SDK API level 18, latest SDK tools, latest platform-tools and build-tools version 23.0.3 +# It also runs update for SDK API level 21, latest SDK tools, latest platform-tools and build-tools version 23.0.3 # Build-tools version 23.0.3 is the latest usable version for Red Hat 6. Newer version of build-tools, version 24.x.x, requires GLIBC_2.14, which is not available in Red Hat 6. @@ -95,7 +95,7 @@ InstallAndroidPackage $targetFolder $sdkVersion $sdkUrl $sdkSha1 $sdkTargetFile echo "Installing Android NDK version $ndkVersion..." InstallAndroidPackage $targetFolder $ndkVersion $ndkUrl $ndkSha1 $ndkTargetFile "$ndkExtract" $ndkFolderName $ndkName -# run update for Android SDK and install SDK API version 18, latest SDK tools, platform-tools and build-tools -echo "Running Android SDK update for API version 18, SDK-tools, platform-tools and build-tools-$sdkBuildToolsVersion..." +# run update for Android SDK and install SDK API version 21, latest SDK tools, platform-tools and build-tools +echo "Running Android SDK update for API version 21, SDK-tools, platform-tools and build-tools-$sdkBuildToolsVersion..." echo "y" |$targetFolder/sdk/tools/android update sdk --no-ui --all --filter $sdkApiLevel,tools,platform-tools,build-tools-$sdkBuildToolsVersion || echo "Failed to run update" |