diff options
| author | Joni Jantti <joni.jantti@qt.io> | 2018-01-10 13:50:23 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2018-08-04 05:06:22 +0000 |
| commit | aeb39be740d309afae2ac5adb2d5e1b8346fdb8a (patch) | |
| tree | 9962f6efae572a3ec86341873d758c251fd2d833 /coin/provisioning | |
| parent | a97bea0821d59e6e251aa0518ff370a7ccd44d52 (diff) | |
Upgrade Android NDK to r16b and switch to clang
We need to upgrade the Android NDK version
when we switch to building with clang.
Task-number: QTQAINFRA-1681
Change-Id: Ic43b28ead393ec5828b099727182df5f4424f419
Reviewed-by: Liang Qi <liang.qi@qt.io>
Diffstat (limited to 'coin/provisioning')
4 files changed, 9 insertions, 9 deletions
diff --git a/coin/provisioning/common/linux/android_linux.sh b/coin/provisioning/common/linux/android_linux.sh index 68e77dd1..7bcdbdce 100755 --- a/coin/provisioning/common/linux/android_linux.sh +++ b/coin/provisioning/common/linux/android_linux.sh @@ -51,13 +51,13 @@ basePath="http://ci-files01-hki.intra.qt.io/input/android" toolsVersion="r25.2.5" toolsFile="tools_$toolsVersion-linux.zip" -ndkVersion="r10e" +ndkVersion="r16b" ndkFile="android-ndk-$ndkVersion-linux-x86_64.zip" sdkBuildToolsVersion="25.0.2" sdkApiLevel="android-21" toolsSha1="72df3aa1988c0a9003ccdfd7a13a7b8bd0f47fc1" -ndkSha1="f692681b007071103277f6edc6f91cb5c5494a32" +ndkSha1="42aa43aae89a50d1c66c3f9fdecd676936da6128" toolsTargetFile="/tmp/$toolsFile" toolsSourceFile="$basePath/$toolsFile" diff --git a/coin/provisioning/common/windows/android-openssl.ps1 b/coin/provisioning/common/windows/android-openssl.ps1 index d838fcc8..ccd24cb9 100644 --- a/coin/provisioning/common/windows/android-openssl.ps1 +++ b/coin/provisioning/common/windows/android-openssl.ps1 @@ -53,9 +53,9 @@ Rename-Item C:\Utils\openssl-$version $destination Remove-Item -Path $zip Remove-Item C:\Utils\openssl-$version.tar -Set-EnvironmentVariable "CC" "C:\utils\android-ndk-r10e\toolchains\arm-linux-androideabi-4.9\prebuilt\windows\bin\arm-linux-androideabi-gcc" -Set-EnvironmentVariable "AR" "C:\utils\android-ndk-r10e\toolchains\arm-linux-androideabi-4.9\prebuilt\windows\bin\arm-linux-androideabi-ar" -Set-EnvironmentVariable "ANDROID_DEV" "C:\utils\android-ndk-r10e\platforms\android-18\arch-arm\usr" +Set-EnvironmentVariable "CC" "C:\utils\android-ndk-r16b\toolchains\llvm\prebuilt\linux-x86_64\bin\clang" +Set-EnvironmentVariable "AR" "C:\utils\android-ndk-r16b\toolchains\llvm\prebuilt\linux-x86_64\bin\llvm-ar" +Set-EnvironmentVariable "ANDROID_DEV" "C:\utils\android-ndk-r16b\platforms\android-18\arch-arm\usr" # Make sure configure for openssl has a "make" and "perl" available $env:PATH = $env:PATH + ";C:\msys\1.0\bin;C:\strawberry\perl\bin" diff --git a/coin/provisioning/common/windows/android.ps1 b/coin/provisioning/common/windows/android.ps1 index 9a09e919..f83a8e60 100644 --- a/coin/provisioning/common/windows/android.ps1 +++ b/coin/provisioning/common/windows/android.ps1 @@ -40,10 +40,10 @@ # That's why we need to use Andoid-21 API version in Qt 5.9. # NDK -$ndkVersion = "r10e" +$ndkVersion = "r16b" $ndkCachedUrl = "\\ci-files01-hki.intra.qt.io\provisioning\android\android-ndk-$ndkVersion-windows-x86.zip" $ndkOfficialUrl = "https://dl.google.com/android/repository/android-ndk-$ndkVersion-windows-x86.zip" -$ndkChecksum = "1d0b8f2835be741f3048fb03c0a3e9f71ab7f357" +$ndkChecksum = "becaf3d445a4877ca1a9300a62f0934a4838c7fa" $ndkFolder = "c:\utils\android-ndk-$ndkVersion" $ndkZip = "c:\Windows\Temp\android_ndk_$ndkVersion.zip" diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/30-android.sh b/coin/provisioning/qtci-macos-10.12-x86_64/30-android.sh index d206369c..e7bb9ca0 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/30-android.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/30-android.sh @@ -49,13 +49,13 @@ basePath="/net/ci-files01-hki.intra.qt.io/hdd/www/input/android" toolsVersion="r25.2.5" toolsFile="tools_$toolsVersion-macosx.zip" -ndkVersion="r10e" +ndkVersion="r16b" ndkFile="android-ndk-$ndkVersion-darwin-x86_64.zip" sdkBuildToolsVersion="25.0.2" sdkApiLevel="android-21" toolsSha1="d2168d963ac5b616e3d3ddaf21511d084baf3659" -ndkSha1="6be8598e4ed3d9dd42998c8cb666f0ee502b1294" +ndkSha1="e51e615449b98c716cf912057e2682e75d55e2de" toolsTargetFile="/tmp/$toolsFile" toolsSourceFile="$basePath/$toolsFile" |