diff options
| author | Samuel Mira <samuel.mira@qt.io> | 2023-04-25 16:53:11 +0300 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-05-17 22:55:21 +0000 |
| commit | e4447d0b55d556ba0551c9665093b229c4e18b14 (patch) | |
| tree | e0c197fce94751ea4615c8bbe46ec20eabff6e65 /coin/platform_configs | |
| parent | ba9e54417e53210481904d1cd82404edcd42d5e8 (diff) | |
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 <lars@knoll.priv.no>
Reviewed-by: Artem Dyomin <artem.dyomin@qt.io>
(cherry picked from commit 2751db4d2902083d3678d16fdb444e053138be19)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'coin/platform_configs')
| -rw-r--r-- | coin/platform_configs/cmake_platforms_target_android.yaml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/coin/platform_configs/cmake_platforms_target_android.yaml b/coin/platform_configs/cmake_platforms_target_android.yaml index af738f2f..8fdd481c 100644 --- a/coin/platform_configs/cmake_platforms_target_android.yaml +++ b/coin/platform_configs/cmake_platforms_target_android.yaml @@ -32,7 +32,7 @@ Configurations: 'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_DEFAULT}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON', 'CONAN_HOST_PROFILE=coin/conan/profiles/ci-windows-x86_64-mingw', 'CONAN_PROFILE=coin/conan/profiles/ci-windows-android-armv7-clang', - 'NON_QTBASE_TARGET_CMAKE_ARGS=-DQT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH={{.Env.Protobuf_ROOT_mingw}}', + 'NON_QTBASE_TARGET_CMAKE_ARGS=-DQT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH={{.Env.Protobuf_ROOT_mingw}} -DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_ARMV7}}', 'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}' ] - |