From bdc867146af3c9a87a42a9a5115ef0b5fe4b25e8 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Wed, 25 Jan 2023 11:21:34 +0000 Subject: [PATCH] Remove ffmpeg for Android 12 This is causing autotest failures in multimedia. Pick-to: dev Task-number: QTBUG-110453 Change-Id: I0c974b7faa6f0a434e65782f22984b532673dea3 Reviewed-by: Artem Dyomin Reviewed-by: Jani Heikkinen --- coin/platform_configs/cmake_platforms_target_android_12.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/coin/platform_configs/cmake_platforms_target_android_12.yaml b/coin/platform_configs/cmake_platforms_target_android_12.yaml index 5e3a6c77..e456aa31 100644 --- a/coin/platform_configs/cmake_platforms_target_android_12.yaml +++ b/coin/platform_configs/cmake_platforms_target_android_12.yaml @@ -12,7 +12,6 @@ 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_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID}}', '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}}',