diff options
| author | Alex Blasche <alexander.blasche@qt.io> | 2017-01-18 13:15:25 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-01-21 07:58:40 +0000 |
| commit | f3b0b9e292b4c267f6cc1f7a214023d5f9db0b65 (patch) | |
| tree | 86d1c0c6b5e46b8d975dee94518e9cf4d7136bb1 | |
| parent | c7e283a595f483bee517bed0efdefc28233de204 (diff) | |
Bump Android API level version to 21
This is required for new Bluetooth features in Qt 5.9+.
Change-Id: I2aa41117dfd93fc94d72012ca229bd2bc61f2bbd
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| -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 7f1cf05b..6b8d59f1 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 @@ -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" |