From 1a1d923c83c5b09e77aa8b7d9cba4278f72080f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nils=20Petter=20Ska=CC=8Alerud?= Date: Fri, 21 Mar 2025 15:48:54 +0100 Subject: [PATCH] Android, FFmpeg: Allow specifying target output in FFpeg install script The provisioning script install-ffmpeg-android.sh can be useful to run locally to make sure we build FFmpeg with the same configuration as we do in CI. This patch introduce an optional parameter to this provisioning script that allows us to specify where to install the compiled binaries. Change-Id: I7ea30bffa4753ac1fab707ed2876ddcbbca06175 Reviewed-by: Assam Boudjelthia (cherry picked from commit 07775b2ad22c063204d0e5c778320a7215465413) Reviewed-by: Qt Cherry-pick Bot --- coin/provisioning/common/unix/install-ffmpeg-android.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/coin/provisioning/common/unix/install-ffmpeg-android.sh b/coin/provisioning/common/unix/install-ffmpeg-android.sh index c4926305..8a855d31 100755 --- a/coin/provisioning/common/unix/install-ffmpeg-android.sh +++ b/coin/provisioning/common/unix/install-ffmpeg-android.sh @@ -8,6 +8,8 @@ set -ex source "${BASH_SOURCE%/*}/../unix/ffmpeg-installation-utils.sh" os="$1" +# Optional parameter to set output installation directory. Useful for local builds. +target_install_dir_param="$2" build_type=$(get_ffmpeg_build_type) ffmpeg_source_dir=$(download_ffmpeg) @@ -109,5 +111,10 @@ else exit 1 fi +# If parameter is set, use it as the target output directory. +if [ ! -z $target_install_dir_param ]; then + target_dir=$target_install_dir_param +fi + build_ffmpeg_android "$target_arch" "$target_dir" set_ffmpeg_dir_env_var "$envvar" "$target_dir"