From efb8dc4713e7f3a74d96ce94fee3eae81aa3787c Mon Sep 17 00:00:00 2001 From: Alexey Edelev Date: Mon, 5 May 2025 20:35:23 +0200 Subject: [PATCH] Add Android bundletool provisioning Tool allows managing modern android bundles. Provision it on RHEL 8.10 platform - the one we use for the Qt for Android x86_64 builds. Change-Id: Ia1a7bb077e9dc0afc95ad92cbd85c96724ab0ced Reviewed-by: Alexandru Croitor Reviewed-by: Assam Boudjelthia --- .../linux/install-android-bundletool.sh | 25 +++++++++++++++++++ .../41-install-bundletool.sh | 8 ++++++ 2 files changed, 33 insertions(+) create mode 100755 coin/provisioning/common/linux/install-android-bundletool.sh create mode 100644 coin/provisioning/qtci-linux-RHEL-8.10-x86_64/41-install-bundletool.sh diff --git a/coin/provisioning/common/linux/install-android-bundletool.sh b/coin/provisioning/common/linux/install-android-bundletool.sh new file mode 100755 index 00000000..ea4d462e --- /dev/null +++ b/coin/provisioning/common/linux/install-android-bundletool.sh @@ -0,0 +1,25 @@ +#!/usr/bin/env bash +# Copyright (C) 2025 The Qt Company Ltd. +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only + +# shellcheck source=../unix/SetEnvVar.sh +source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" +# shellcheck source=../unix/DownloadURL.sh +source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh" + +version="1.18.1" +internalUrl="http://ci-files01-hki.ci.qt.io/input/bundletool/bundletool-all-$version.jar" +externalUrl="https://github.com/google/bundletool/releases/download/$version/bundletool-all-$version.jar" +sha256="675786493983787ffa11550bdb7c0715679a44e1643f3ff980a529e9c822595c" +targetFile="$HOME/bundletool" +installPrefix="/opt/bundletool" + +DownloadURL "$internalUrl" "$externalUrl" "$sha256" "$targetFile" + + +sudo mkdir -p "$installPrefix" +sudo mv "$targetFile" "$installPrefix/bundletool" + +SetEnvVar "Bundletool_EXECUTABLE" "$installPrefix/bundletool" + +echo "bundletool = $version" >> ~/versions.txt diff --git a/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/41-install-bundletool.sh b/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/41-install-bundletool.sh new file mode 100644 index 00000000..a4bf3796 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/41-install-bundletool.sh @@ -0,0 +1,8 @@ +#!/usr/bin/env bash +# Copyright (C) 2025 The Qt Company Ltd. +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only + +set -ex + +# shellcheck source=../common/linux/install-android-bundletool.sh +source "${BASH_SOURCE%/*}/../common/linux/install-android-bundletool.sh"