aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHeikki Halmet <heikki.halmet@qt.io>2021-07-01 09:20:10 +0300
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-07-01 15:19:48 +0000
commitc9bc1ffc109af645077ecbeac7fc254b027223c6 (patch)
treef7661981daa5926e756200476443080c6a52b9ec
parente0eb04ecf8b59f73e685f01b084af65404263fd5 (diff)
Add correct version for prebuilt OpenSSL Android
Script was pointing to incorrect version and the prebuilt version was missing from cache. OpenSSL Android is now rebuilt and cached. Task-number: QTQAINFRA-4501 Change-Id: I31db800fa6814c3e7c1e649e2bbe3e3c80b9f4ce Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> (cherry picked from commit 675c9ad6c63356edddf9b449dde9608de00f21da) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rwxr-xr-xcoin/provisioning/common/linux/openssl_for_android_linux.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/coin/provisioning/common/linux/openssl_for_android_linux.sh b/coin/provisioning/common/linux/openssl_for_android_linux.sh
index f520ea5f..13424c6f 100755
--- a/coin/provisioning/common/linux/openssl_for_android_linux.sh
+++ b/coin/provisioning/common/linux/openssl_for_android_linux.sh
@@ -71,9 +71,9 @@ cd "$opensslHome"
PATH=$TOOLCHAIN:$PATH CC=clang ./Configure android-arm
PATH=$TOOLCHAIN:$PATH CC=clang make build_generated
'
-prebuiltUrl="http://ci-files01-hki.intra.qt.io/input/openssl/prebuilt-openssl-1_1_1_g_for-android-ndk-21.tar.gz"
+prebuiltUrl="http://ci-files01-hki.intra.qt.io/input/openssl/prebuilt-openssl-1_1_1_k_for-android-ndk-21.tar.gz"
targetFile="/tmp/prebuilt-openssl-$version.tar.gz"
-sha="2998e1a3bc9aa4bc7475d1be270db9f4109fca00"
+sha="8c4db1eb8460d749c998a0e033b3939123cbc5ac"
DownloadURL "$prebuiltUrl" "$prebuiltUrl" "$sha" "$targetFile"
tar -xzf "$targetFile" -C "${HOME}"