diff options
| author | Alexey Edelev <[email protected]> | 2024-02-29 12:10:57 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <[email protected]> | 2024-03-04 12:59:35 +0000 |
| commit | 99764828112385915acacd2f92190f61091bd2a0 (patch) | |
| tree | 02d19b5373c43e03f479cc7d2a4d6463246a301a | |
| parent | 50d46911cc19859791888b9a23c6742e09f91e93 (diff) | |
Disable depfile support for the external projects when building for Android
androiddeployqt rules that support depfiles cause creation of rules that
interfere each other and cause the test build flakiness in CI.
This disables depfile support for ABI-specific external project until the
rootcase is found.
Task-number: QTBUG-122838
Change-Id: I12e85f43494331c943c9b516d9494593facf9180
Reviewed-by: Assam Boudjelthia <[email protected]>
(cherry picked from commit 356b0aee0e93c9fc51e79faa8d6904bf4d5a6c27)
Reviewed-by: Qt Cherry-pick Bot <[email protected]>
(cherry picked from commit 58b9d558ddd72656b2e7204e7021758efd169c91)
(cherry picked from commit b62c56578cabc387cdc98704332d74a45112cc60)
| -rw-r--r-- | src/corelib/Qt6AndroidMacros.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/Qt6AndroidMacros.cmake b/src/corelib/Qt6AndroidMacros.cmake index c0319fbdb3c..83b82f3e4ba 100644 --- a/src/corelib/Qt6AndroidMacros.cmake +++ b/src/corelib/Qt6AndroidMacros.cmake @@ -558,7 +558,7 @@ function(qt6_android_add_apk_target target) "$<TARGET_FILE:${target}>" "${androiddeployqt_output_path}/${target_file_copy_relative_path}" ) - if(has_depfile_support) + if(has_depfile_support AND FALSE) # TODO: It breaks multi-abi builds. See QTBUG-122838 set(deploy_android_deps_dir "${apk_final_dir}/${target}_deploy_android") set(timestamp_file "${deploy_android_deps_dir}/timestamp") set(dep_file "${deploy_android_deps_dir}/${target}.d") |