From e4447d0b55d556ba0551c9665093b229c4e18b14 Mon Sep 17 00:00:00 2001 From: Samuel Mira Date: Tue, 25 Apr 2023 16:53:11 +0300 Subject: Fix FFmpeg provisioning for Android armv7a Altered install-ffmpeg.ps1 script to build android armv7a archicture Task-number: QTQAINFRA-5476 Change-Id: I5179174c8676a3016df2922c00030e9d45a9009c Reviewed-by: Lars Knoll Reviewed-by: Artem Dyomin (cherry picked from commit 2751db4d2902083d3678d16fdb444e053138be19) Reviewed-by: Qt Cherry-pick Bot --- .../provisioning/common/windows/install-ffmpeg.ps1 | 33 +++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) (limited to 'coin/provisioning') diff --git a/coin/provisioning/common/windows/install-ffmpeg.ps1 b/coin/provisioning/common/windows/install-ffmpeg.ps1 index 0bf913fa..a608bdba 100644 --- a/coin/provisioning/common/windows/install-ffmpeg.ps1 +++ b/coin/provisioning/common/windows/install-ffmpeg.ps1 @@ -141,13 +141,44 @@ function InstallLlvmMingwFfmpeg { return InstallFfmpeg -buildSystem "llvm-mingw" -msystem "CLANG64" -ffmpegDirEnvVar "FFMPEG_DIR_LLVM_MINGW" -additionalPath "C:\llvm-mingw\bin" } +function InstallAndroidArmv7 { + + $target_toolchain_arch="armv7a-linux-androideabi" + $target_arch="armv7-a" + $target_cpu="armv7-a" + $api_version="24" + + $ndkVersionLatest = "r25b" + $ndkFolderLatest = "/c/Utils/Android/android-ndk-$ndkVersionLatest" + + $toolchain="${ndkFolderLatest}/toolchains/llvm/prebuilt/windows-x86_64" + $toolchain_bin="${toolchain}/bin" + $sysroot="${toolchain}/sysroot" + $cxx="${toolchain_bin}/${target_toolchain_arch}${api_version}-clang++" + $cc="${toolchain_bin}/${target_toolchain_arch}${api_version}-clang" + $ld="${toolchain_bin}/ld.exe" + $ar="${toolchain_bin}/llvm-ar.exe" + $ranlib="${toolchain_bin}/llvm-ranlib.exe" + $nm="${toolchain_bin}/llvm-nm.exe" + $strip="${toolchain_bin}/llvm-strip.exe" + + $config = Get-Content "$PSScriptRoot\..\shared\ffmpeg_config_options.txt" + $config += " --disable-vulkan --enable-cross-compile --target-os=android --enable-jni --enable-mediacodec --enable-pthreads --enable-neon --disable-asm --disable-indev=android_camera" + $config += " --arch=$target_arch --cpu=${target_cpu} --sysroot=${sysroot} --sysinclude=${sysroot}/usr/include/" + $config += " --cc=${cc} --cxx=${cxx} --ar=${ar} --ranlib=${ranlib}" + + return InstallFfmpeg -buildSystem "android-arm" -msystem "ANDROID_CLANG" -ffmpegDirEnvVar "FFMPEG_DIR_ANDROID_ARMV7" +} + $mingwRes = InstallMingwFfmpeg $msvcRes = InstallMsvcFfmpeg $llvmMingwRes = InstallLlvmMingwFfmpeg +$androidArmV7Res = InstallAndroidArmv7 Write-Host "Ffmpeg installation results:" Write-Host " mingw:" $(if ($mingwRes) { "OK" } else { "FAIL" }) Write-Host " msvc:" $(if ($msvcRes) { "OK" } else { "FAIL" }) Write-Host " llvm-mingw:" $(if ($llvmMingwRes) { "OK" } else { "FAIL" }) +Write-Host " android-armv7:" $(if ($androidArmV7Res) { "OK" } else { "FAIL" }) -exit $(if ($mingwRes -and $msvcRes -and $llvmMingwRes) { 0 } else { 1 }) +exit $(if ($mingwRes -and $msvcRes -and $llvmMingwRes -and $androidArmV7Res) { 0 } else { 1 }) -- cgit v1.2.3