diff options
| author | Samuel Mira <samuel.mira@qt.io> | 2023-04-17 10:56:30 +0300 |
|---|---|---|
| committer | Samuel Mira <samuel.mira@qt.io> | 2023-04-26 22:44:30 +0000 |
| commit | 99afe7199ecc09e56cb5d779db31bf65ba98fa3d (patch) | |
| tree | 209422b22b704515da1251376d7786b45088498a /coin/platform_configs/cmake_platforms_target_android_12.yaml | |
| parent | dbbcf2fa3a2d8686185d35a05272aaf6317f435d (diff) | |
Fix FFmpeg provisioning for Android in arm64, x86 and x86_64
Added install-ffmpeg-android script for the android cross-compile
Removed android stuff from install-ffmpeg
Changed the yaml variables to include the target arch
Added the arm64 target arch
Task-number: QTQAINFRA-5476
Pick-to: 6.5
Change-Id: Id9609ed0427f2fc42f7f27e7787a81ad145f59be
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
Reviewed-by: Rami Potinkara <rami.potinkara@qt.io>
Reviewed-by: Lars Knoll <lars@knoll.priv.no>
Diffstat (limited to 'coin/platform_configs/cmake_platforms_target_android_12.yaml')
| -rw-r--r-- | coin/platform_configs/cmake_platforms_target_android_12.yaml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/coin/platform_configs/cmake_platforms_target_android_12.yaml b/coin/platform_configs/cmake_platforms_target_android_12.yaml index 4117b500..287f46e4 100644 --- a/coin/platform_configs/cmake_platforms_target_android_12.yaml +++ b/coin/platform_configs/cmake_platforms_target_android_12.yaml @@ -12,7 +12,7 @@ Configurations: Environment variables: [ 'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86_64', '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', - 'NON_QTBASE_TARGET_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID}}', + 'NON_QTBASE_TARGET_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_X86_64}}', 'CONAN_HOST_PROFILE=coin/conan/profiles/ci-linux-x86_64-gcc', 'CONAN_PROFILE=coin/conan/profiles/ci-unix-android-x86_64-clang', 'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}', |