diff options
author | Heikki Halmet <heikki.halmet@qt.io> | 2023-01-25 11:21:34 +0000 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-01-25 20:02:29 +0000 |
commit | de316b4365a9e5d9ac07f067fc645e7d8de9ab61 (patch) | |
tree | 5b2b7a0366fa9fd8d06ed358ec36542c84173820 /coin/platform_configs | |
parent | 72eb1b1a5dfccc571dbe43804498f2f2feb59f2b (diff) |
Remove ffmpeg for Android 12
This is causing autotest failures in multimedia.
Task-number: QTBUG-110453
Change-Id: I0c974b7faa6f0a434e65782f22984b532673dea3
Reviewed-by: Artem Dyomin <artem.dyomin@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit bdc867146af3c9a87a42a9a5115ef0b5fe4b25e8)
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_12.yaml | 1 |
1 files changed, 0 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 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}}', |