From 608788de2d10c55b0b3d7c11776f368da015a89a Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Thu, 17 Jan 2019 15:24:27 +0200 Subject: Provisioning: Update Android NDK to version r19 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Also let's start using 64-bit Android NDK for Windows Task-number: QTQAINFRA-2568 Change-Id: I2d757aa9e43abf5118abad7bf644e17e88a2ca94 Reviewed-by: Qt CI Bot Reviewed-by: Tony Sarajärvi (cherry picked from commit c09135cb56e03dd6a09b79f2c6e15932e9433df2) Reviewed-by: Jani Heikkinen --- coin/provisioning/common/linux/android_linux.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'coin/provisioning/common/linux') diff --git a/coin/provisioning/common/linux/android_linux.sh b/coin/provisioning/common/linux/android_linux.sh index c77af943..a15bcf03 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="r26.1.1" toolsFile="sdk-tools-linux-4333796.zip" -ndkVersion="r18b" +ndkVersion="r19c" ndkFile="android-ndk-$ndkVersion-linux-x86_64.zip" sdkBuildToolsVersion="28.0.3" sdkApiLevel="android-28" toolsSha1="8c7c28554a32318461802c1291d76fccfafde054" -ndkSha1="500679655da3a86aecf67007e8ab230ea9b4dd7b" +ndkSha1="fd94d0be6017c6acbd193eb95e09cf4b6f61b834" toolsTargetFile="/tmp/$toolsFile" toolsSourceFile="$basePath/$toolsFile" -- cgit v1.2.3 From a2b1dd2d0afe58f27b1585ecab5235ae32932ef8 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Fri, 5 Apr 2019 13:43:07 +0300 Subject: Provisioning: Use ANDROID_NDK_ROOT instead of ANDROID_NDK_HOME MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Without this binaries will be hardcoded to look in e.g /opt/android/android-ndk-r19b which means that RTA tests will fail Task-number: QTBUG-74952 Change-Id: Ic2b1297e15d905f2250333b6bc884abe2f1472d4 Reviewed-by: Tony Sarajärvi (cherry picked from commit dbaa42baa77309a1aa407cd45078d885f7428aa2) Reviewed-by: Jani Heikkinen --- coin/provisioning/common/linux/android_linux.sh | 1 + 1 file changed, 1 insertion(+) (limited to 'coin/provisioning/common/linux') diff --git a/coin/provisioning/common/linux/android_linux.sh b/coin/provisioning/common/linux/android_linux.sh index a15bcf03..5840d4b4 100755 --- a/coin/provisioning/common/linux/android_linux.sh +++ b/coin/provisioning/common/linux/android_linux.sh @@ -95,6 +95,7 @@ ls -l "$sdkTargetFolder" SetEnvVar "ANDROID_SDK_HOME" "$sdkTargetFolder" SetEnvVar "ANDROID_NDK_HOME" "$targetFolder/android-ndk-$ndkVersion" +SetEnvVar "ANDROID_NDK_ROOT" "$targetFolder/android-ndk-$ndkVersion" SetEnvVar "ANDROID_NDK_HOST" "linux-x86_64" SetEnvVar "ANDROID_API_VERSION" "$sdkApiLevel" -- cgit v1.2.3 From 31f5c48a80e140562588bd673ef35fb4efe3d643 Mon Sep 17 00:00:00 2001 From: Juha Karjalainen Date: Thu, 1 Nov 2018 12:23:34 +0200 Subject: Provisioning: Change openssl version to 1.1.1b Use newest LTS version of openssl as support for 1.0.2 series will end at end of 2019. For windows 7 x86 openssl 1.0.2 will be used until all need fixed are made to submodule tests Task-number: QTQAINFRA-2327 Change-Id: I930d239cd139b6202ebdfb5cdc8068ff2ad0b8a3 Reviewed-by: Jani Heikkinen (cherry picked from commit 3e838f2a34d0c1538535bd184aa12681497c8a38) --- .../common/linux/openssl_for_android_linux.sh | 38 +++++++++++++--------- 1 file changed, 22 insertions(+), 16 deletions(-) (limited to 'coin/provisioning/common/linux') diff --git a/coin/provisioning/common/linux/openssl_for_android_linux.sh b/coin/provisioning/common/linux/openssl_for_android_linux.sh index 09d0b6d5..d833975f 100755 --- a/coin/provisioning/common/linux/openssl_for_android_linux.sh +++ b/coin/provisioning/common/linux/openssl_for_android_linux.sh @@ -35,32 +35,38 @@ # This script install OpenSSL from sources. # Requires GCC and Perl to be in PATH. - +set -ex # shellcheck source=../unix/DownloadURL.sh source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh" # shellcheck source=../unix/SetEnvVar.sh source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" -version="1.0.2p" +exports_file="/tmp/export.sh" +# source previously made environmental variables. +if uname -a |grep -q "Ubuntu"; then + # shellcheck disable=SC1090 + grep -e "^export" "$HOME/.profile" > $exports_file && source $exports_file + rm -rf "$exports_file" +else + # shellcheck disable=SC1090 + grep -e "^export" "$HOME/.bashrc" > $exports_file && source $exports_file + rm -rf "$exports_file" +fi + +version="1.1.1b" officialUrl="https://www.openssl.org/source/openssl-$version.tar.gz" cachedUrl="http://ci-files01-hki.intra.qt.io/input/openssl/openssl-$version.tar.gz" targetFile="/tmp/openssl-$version.tar.gz" -installFolder="/home/qt/" -sha="f34b5322e92415755c7d58bf5d0d5cf37666382c" -# Until every VM doing Linux Android builds have provisioned the env variable -# OPENSSL_ANDROID_HOME, we can't change the hard coded path that's currently in Coin. -# QTQAINFRA-1436 -opensslHome="${installFolder}openssl-1.0.2" - +sha="e9710abf5e95c48ebf47991b10cbb48c09dae102" +opensslHome="${HOME}/openssl/android/openssl-${version}" DownloadURL "$cachedUrl" "$officialUrl" "$sha" "$targetFile" +mkdir -p "${HOME}/openssl/android/" +tar -xzf "$targetFile" -C "${HOME}/openssl/android/" -tar -xzf "$targetFile" -C "$installFolder" -# This rename should be removed once hard coded path from Coin is fixed. (QTQAINFRA-1436) -mv "${opensslHome}p" "${opensslHome}" -pushd "$opensslHome" - -echo "Running configure" -perl Configure shared android +TOOLCHAIN=${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin +cd "$opensslHome" +PATH=$TOOLCHAIN:$PATH CC=clang ./Configure android-arm +PATH=$TOOLCHAIN:$PATH CC=clang make build_generated SetEnvVar "OPENSSL_ANDROID_HOME" "$opensslHome" -- cgit v1.2.3