aboutsummaryrefslogtreecommitdiffstats
path: root/coin
diff options
context:
space:
mode:
authorHeikki Halmet <heikki.halmet@qt.io>2023-01-23 09:06:36 +0000
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2023-01-24 05:47:06 +0000
commit015b6a7c7671bfd41686a1b8f2e76c4a21a5762e (patch)
tree72d8f133794ae635c223e7079a6423827cd13964 /coin
parent8e435d92df896eda36190b12f68347601d6c368e (diff)
Remove ffmpeg for Android
This is causing autotest failures in multimedia. Task-number: QTBUG-110453 Change-Id: I1eacd8eec72d4f17f7f18df9f70c07bbecc0d48b Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> (cherry picked from commit 7051182f20a6050278b1355070ac9129e42c364c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'coin')
-rw-r--r--coin/platform_configs/cmake_platforms_target_android.yaml1
1 files changed, 0 insertions, 1 deletions
diff --git a/coin/platform_configs/cmake_platforms_target_android.yaml b/coin/platform_configs/cmake_platforms_target_android.yaml
index f412c30f..45b23aaf 100644
--- a/coin/platform_configs/cmake_platforms_target_android.yaml
+++ b/coin/platform_configs/cmake_platforms_target_android.yaml
@@ -47,7 +47,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',