From 096e9c86d738974d73b7705d2265a9dcf384e159 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Mon, 23 Jan 2023 09:06:36 +0000 Subject: [PATCH] Remove ffmpeg for Android This is causing autotest failures in multimedia. Task-number: QTBUG-110453 Change-Id: I1eacd8eec72d4f17f7f18df9f70c07bbecc0d48b Reviewed-by: Jani Heikkinen (cherry picked from commit 7051182f20a6050278b1355070ac9129e42c364c) Reviewed-by: Qt Cherry-pick Bot --- coin/platform_configs/cmake_platforms_target_android.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/coin/platform_configs/cmake_platforms_target_android.yaml b/coin/platform_configs/cmake_platforms_target_android.yaml index 684da249..3cb87c10 100644 --- a/coin/platform_configs/cmake_platforms_target_android.yaml +++ b/coin/platform_configs/cmake_platforms_target_android.yaml @@ -43,7 +43,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', '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-clang', 'ANDROID_EMULATOR=@emulator_x86_api_23',