From 5d5324449cb0652bc44eef241c54e288ebfc9469 Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Fri, 15 Nov 2024 12:01:56 +0100 Subject: [PATCH] Revert "Remove lint expection in developer build" This reverts commit 6bb3feffd56424d0990b1345f343012a60e3351e, which resulted in cyclic dependencies when running _check targets several times: ninja: error: dependency cycle: qtbase/src/android/templates/build.gradle -> qtbase/src/android/templates/build.gradle Change-Id: I5ae178d137044afe7b627d2637bc43913f00812a Reviewed-by: Alexandru Croitor (cherry picked from commit 121551e88380a9e87d2190ccdc6417214622a0fb) Reviewed-by: Qt Cherry-pick Bot --- src/android/templates/CMakeLists.txt | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/src/android/templates/CMakeLists.txt b/src/android/templates/CMakeLists.txt index 5fed4bb9c7d..94f3243c223 100644 --- a/src/android/templates/CMakeLists.txt +++ b/src/android/templates/CMakeLists.txt @@ -3,30 +3,9 @@ # Android template files -set(build_gradle "build.gradle") -if(QT_FEATURE_developer_build) - file(READ "${CMAKE_CURRENT_SOURCE_DIR}/${build_gradle}" build_gradle_in) - string(REGEX REPLACE - "\n *//noinspection GradleDependency\n" - "\n" - build_gradle_out - "${build_gradle_in}" - ) - qt_configure_file( - OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${build_gradle}" - CONTENT "${build_gradle_out}" - ) -else() - configure_file( - "${CMAKE_CURRENT_SOURCE_DIR}/${build_gradle}" - "${CMAKE_CURRENT_BINARY_DIR}/${build_gradle}" - COPYONLY - ) -endif() - set(template_files "${CMAKE_CURRENT_SOURCE_DIR}/AndroidManifest.xml" - "${CMAKE_CURRENT_BINARY_DIR}/${build_gradle}") + "${CMAKE_CURRENT_SOURCE_DIR}/build.gradle") set(template_directories "${CMAKE_CURRENT_SOURCE_DIR}/res")