diff options
Diffstat (limited to 'coin/provisioning/qtci-linux-RHEL-6.6-x86_64/android_linux.sh')
| -rw-r--r-- | coin/provisioning/qtci-linux-RHEL-6.6-x86_64/android_linux.sh | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/android_linux.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/android_linux.sh index 1d0630ce..6bb7a37e 100644 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/android_linux.sh +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/android_linux.sh @@ -35,13 +35,13 @@ # 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. # 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 sdkPackage="android-sdk_r24.4.1-linux.tgz" sdkBuildToolsVersion="23.0.3" -sdkApiLevel="android-18" +sdkApiLevel="android-21" sdkUrl="$baseUrl/$sdkPackage" sdkSha1="725bb360f0f7d04eaccff5a2d57abdd49061326d" sdkTargetFile="$targetFolder/$sdkPackage" @@ -96,13 +96,11 @@ InstallAndroidPackage "$targetFolder" $sdkPackage $sdkUrl $sdkSha1 $sdkTargetFil echo "Installing Android NDK version $ndkPackage..." InstallAndroidPackage "$targetFolder" $ndkPackage $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" -# For Qt 5.6, we by default require API levels 10, 11, 16 and 18, but we can override this by setting ANDROID_API_VERSION=android-18 -# From Qt 5.7 forward, if android-16 is not installed, Qt will automatically use more recent one. -echo 'export ANDROID_API_VERSION=android-18' >> ~/.bashrc +echo 'export ANDROID_API_VERSION=android-21' >> ~/.bashrc # Storage version information to ~/versions.txt, which is used to print version information to provision log. echo "***** Android SDK *****" >> ~/versions.txt @@ -114,4 +112,3 @@ sdkTools="$(grep Pkg.Revision "$targetFolder"/sdk/tools/source.properties | cut echo "Android SDK Tools = $sdkTools" >> ~/versions.txt echo "***** Android NDK *****" >> ~/versions.txt echo "Android NDK Version = $ndkVersion" >> ~/versions.txt - |