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

Bump Android API level to 21

Browse Source 
This extends commit f3b0b9e292 to the
macOS and Windows platforms.

Change-Id: I180d81266897582cee1bec5938fbd3bb9c5c2ee3
Task-number: QTBUG-58367
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
This commit is contained in:
Simon Hausmann
2017-01-30 10:33:49 +01:00
parent a20cc5b452
commit dfaa59fcb3
4 changed files with 24 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
coin/provisioning/qtci-linux-RHEL-6.6-x86_64/android_sdk_linux.sh
View File

@@ -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"