From 033329cb00d098b5222ca98da4f5b095e45753f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nils=20Petter=20Sk=C3=A5lerud?= Date: Wed, 11 Feb 2026 14:07:09 +0100 Subject: [PATCH] Stop compiling FFmpeg Android arm64 on old macOS x86 hosts Android FFmpeg provisioning requires 'readelf', which is provided by binutils package. This package is shown to be flaky on older macOS x86 hosts. It is not critical that we compile that we compile Android FFmpeg on these hosts, so this patch removes them. Pick-to: 6.11 6.10 6.8 Change-Id: I6722f2c543b022a998573cc76ffc671378a4fcb5 Reviewed-by: Tero Heikkinen --- coin/provisioning/qtci-macos-12-x86_64/90-install-ffmpeg.sh | 2 +- coin/provisioning/qtci-macos-13-x86_64/90-install-ffmpeg.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/coin/provisioning/qtci-macos-12-x86_64/90-install-ffmpeg.sh b/coin/provisioning/qtci-macos-12-x86_64/90-install-ffmpeg.sh index 70dee095..d0c4db0b 100755 --- a/coin/provisioning/qtci-macos-12-x86_64/90-install-ffmpeg.sh +++ b/coin/provisioning/qtci-macos-12-x86_64/90-install-ffmpeg.sh @@ -5,5 +5,5 @@ set -ex source "${BASH_SOURCE%/*}/../common/macos/install-ffmpeg-macos.sh" "macos-universal" -source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-android.sh" "android-arm64" "use_16kb_page_size" +#source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-android.sh" "android-arm64" "use_16kb_page_size" source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-ios.sh" diff --git a/coin/provisioning/qtci-macos-13-x86_64/90-install-ffmpeg.sh b/coin/provisioning/qtci-macos-13-x86_64/90-install-ffmpeg.sh index 70dee095..d0c4db0b 100755 --- a/coin/provisioning/qtci-macos-13-x86_64/90-install-ffmpeg.sh +++ b/coin/provisioning/qtci-macos-13-x86_64/90-install-ffmpeg.sh @@ -5,5 +5,5 @@ set -ex source "${BASH_SOURCE%/*}/../common/macos/install-ffmpeg-macos.sh" "macos-universal" -source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-android.sh" "android-arm64" "use_16kb_page_size" +#source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-android.sh" "android-arm64" "use_16kb_page_size" source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-ios.sh"