From ffc15eb35f5fee45be2df4279758410c5fbb33a8 Mon Sep 17 00:00:00 2001 From: Elias Toivola Date: Wed, 13 Aug 2025 16:34:31 +0300 Subject: [PATCH] Android FFmpeg: Further fix FFmpeg build directories This fixes "does not exist" errors when trying to build multiple NDKs. This amends 303b4c13dcf46897d6f30ff45adf65e41294a5f5 Pick-to: 6.10 6.9 6.8 6.5 Task-number: QTQAINFRA-7069 Change-Id: I29f5cd85ffb3cf12a81b5816a5601ea37446042d Reviewed-by: Assam Boudjelthia --- coin/provisioning/common/unix/install-ffmpeg-android.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/coin/provisioning/common/unix/install-ffmpeg-android.sh b/coin/provisioning/common/unix/install-ffmpeg-android.sh index dee23e30..827fda5d 100755 --- a/coin/provisioning/common/unix/install-ffmpeg-android.sh +++ b/coin/provisioning/common/unix/install-ffmpeg-android.sh @@ -146,19 +146,19 @@ fi assert_envvar_is_populated_dir "ANDROID_NDK_ROOT_LATEST" assert_envvar_is_populated_dir "OPENSSL_ANDROID_HOME_LATEST" -build_ffmpeg_android "$target_arch" "$target_dir" "$ANDROID_NDK_ROOT_LATEST" "$OPENSSL_ANDROID_HOME_LATEST" -set_ffmpeg_dir_env_var "$envvar_latest" "$target_dir" +build_ffmpeg_android "$target_arch" "$target_dir/latest" "$ANDROID_NDK_ROOT_LATEST" "$OPENSSL_ANDROID_HOME_LATEST" +set_ffmpeg_dir_env_var "$envvar_latest" "$target_dir/latest" 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" + build_ffmpeg_android "$target_arch" "$target_dir/nightly1" "$ANDROID_NDK_ROOT_NIGHTLY1" "$OPENSSL_ANDROID_HOME_NIGHTLY1" 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" + build_ffmpeg_android "$target_arch" "$target_dir/nightly2" "$ANDROID_NDK_ROOT_NIGHTLY2" "$OPENSSL_ANDROID_HOME_NIGHTLY2" set_ffmpeg_dir_env_var "$envvar_nightly2" "$target_dir/nightly2" fi