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

Bump Android API level version to 21

Browse Source 
This is required for new Bluetooth features in Qt 5.9+.

Change-Id: I2aa41117dfd93fc94d72012ca229bd2bc61f2bbd
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
This commit is contained in:
Alex Blasche
2017-01-18 13:15:25 +01:00
committed by Liang Qi
parent c7e283a595
commit f3b0b9e292
1 changed files with 3 additions and 3 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

@@ -40,8 +40,8 @@
# 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.
# Android 16 is the minimum requirement for Qt 5.7 applications, but we need something more recent than that for building Qt itself.
# E.g The Bluetooth features that require Android 18 will disable themselves dynamically when running on an Android 16 device.
# That's why we need to use Andoid-18 API version and decision was made to use it also with Qt 5.6.
# E.g The Bluetooth features that require Android 21 will disable themselves dynamically when running on an Android 16 device.
# That's why we need to use Andoid-21 API version in Qt 5.9.
set -e
targetFolder="/opt/android"
@@ -50,7 +50,7 @@ baseUrl="http://ci-files01-hki.ci.local/input/android"
# SDK
sdkVersion="android-sdk_r24.4.1-linux.tgz"
sdkBuildToolsVersion="23.0.3"
sdkApiLevel="android-18"
sdkApiLevel="android-21"
sdkUrl="$baseUrl/$sdkVersion"
sdkSha1="725bb360f0f7d04eaccff5a2d57abdd49061326d"
sdkTargetFile="$targetFolder/$sdkVersion"