From 303b4c13dcf46897d6f30ff45adf65e41294a5f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nils=20Petter=20Ska=CC=8Alerud?= Date: Fri, 20 Jun 2025 10:06:53 +0200 Subject: [PATCH] Coin, FFmpeg, Android: Fix nightly FFmpeg build folder (Unix) Previous patch 75fea893b1ef528547ac1e00001cd58ecd481ac2 introduced a small bug where multiple nightly builds of FFmpeg were being outputted into the same directory, effectively causing them to overwrite each other. This patch gives the nightly builds their own subfolder for outputted library files. Pick-to: 6.10 Task-number: QTQAINFRA-7069 Change-Id: I5f7e111708aecedd2817888948b77b8163f0452d Reviewed-by: Artem Dyomin --- coin/provisioning/common/unix/install-ffmpeg-android.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/coin/provisioning/common/unix/install-ffmpeg-android.sh b/coin/provisioning/common/unix/install-ffmpeg-android.sh index a2650b72..176ac044 100755 --- a/coin/provisioning/common/unix/install-ffmpeg-android.sh +++ b/coin/provisioning/common/unix/install-ffmpeg-android.sh @@ -141,12 +141,12 @@ if [ "${ANDROID_NDK_ROOT_NIGHTLY1}" ]; then assert_envvar_is_populated_dir "ANDROID_NDK_ROOT_NIGHTLY1" assert_envvar_is_populated_dir "OPENSSL_ANDROID_HOME_NIGHTLY1" build_ffmpeg_android "$target_arch" "$target_dir" "$ANDROID_NDK_ROOT_NIGHTLY1" "$OPENSSL_ANDROID_HOME_NIGHTLY1" - set_ffmpeg_dir_env_var "$envvar_nightly1" "$target_dir" + set_ffmpeg_dir_env_var "$envvar_nightly1" "$target_dir/nightly1" fi if [ "${ANDROID_NDK_ROOT_NIGHTLY2}" ]; then assert_envvar_is_populated_dir "ANDROID_NDK_ROOT_NIGHTLY2" assert_envvar_is_populated_dir "OPENSSL_ANDROID_HOME_NIGHTLY2" build_ffmpeg_android "$target_arch" "$target_dir" "$ANDROID_NDK_ROOT_NIGHTLY2" "$OPENSSL_ANDROID_HOME_NIGHTLY2" - set_ffmpeg_dir_env_var "$envvar_nightly2" "$target_dir" + set_ffmpeg_dir_env_var "$envvar_nightly2" "$target_dir/nightly2" fi