From a675a87446c02867603075768259de25bbe48246 Mon Sep 17 00:00:00 2001 From: Bartlomiej Moskal Date: Wed, 29 May 2024 11:02:12 +0200 Subject: [PATCH] Coin: Turn on Dynamically linked FFmpeg for Android Turn on dynamically linked ffmpeg on Android on all hosts (Linux, Windows and macOS). Pick-to: 6.8 Task-number: QTBUG-122010 Change-Id: Ib3739173bee209ce73e77b75d7b345208da002e4 Reviewed-by: Artem Dyomin --- coin/provisioning/common/unix/install-ffmpeg-android.sh | 2 +- coin/provisioning/common/windows/install-ffmpeg.ps1 | 2 +- 2 files 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 ffb9d28c..0bb15586 100755 --- a/coin/provisioning/common/unix/install-ffmpeg-android.sh +++ b/coin/provisioning/common/unix/install-ffmpeg-android.sh @@ -123,4 +123,4 @@ elif [ "$os" == "android-arm64" ]; then SetEnvVar "FFMPEG_DIR_ANDROID_ARM64" "$target_dir" fi -build_ffmpeg_android "$target_arch" "$target_dir" +build_ffmpeg_android "$target_arch" "$target_dir" "yes" diff --git a/coin/provisioning/common/windows/install-ffmpeg.ps1 b/coin/provisioning/common/windows/install-ffmpeg.ps1 index f9fdb21d..bca82822 100644 --- a/coin/provisioning/common/windows/install-ffmpeg.ps1 +++ b/coin/provisioning/common/windows/install-ffmpeg.ps1 @@ -134,7 +134,7 @@ function InstallLlvmMingwFfmpeg { } function InstallAndroidArmv7 { - $shared=$false + $shared=$true $target_toolchain_arch="armv7a-linux-androideabi" $target_arch="armv7-a" $target_cpu="armv7-a"