🏡 Stop including android lint results in runtime_deps

build/config/android/internal_rules.gni

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//build/config/android/config.gni")
 import("//build/config/sanitizers/sanitizers.gni")
 import("//build/config/zip.gni")
 import("//third_party/ijar/ijar.gni")
 
 assert(is_android)
@@ skipping 1572 matching lines @@
     _jar_name = invoker.jar_name
   }
   target_dir_name = get_label_info(":$target_name", "dir")
   _jar_path = "$root_out_dir/lib.java$target_dir_name/$_jar_name.jar"
   if (defined(invoker.jar_path)) {
     _jar_path = invoker.jar_path
   }
   _template_name = target_name
 
   _final_deps = []
-  _final_datadeps = []
-  if (defined(invoker.datadeps)) {
-    _final_datadeps = invoker.datadeps
-  }
 
   _supports_android =
       defined(invoker.supports_android) && invoker.supports_android
   _requires_android =
       defined(invoker.requires_android) && invoker.requires_android
   assert(_requires_android || true)  # Mark as used.
   _android_manifest = "//build/android/AndroidManifest.xml"
   if (defined(invoker.android_manifest)) {
     _android_manifest = invoker.android_manifest
   }
@@ skipping 113 matching lines @@
       build_config = _build_config
       jar_path = _jar_path
       script_name = _template_name
       if (defined(invoker.wrapper_script_name)) {
         script_name = invoker.wrapper_script_name
       }
       deps = build_config_deps
     }
   }
 
+  _has_lint_target = false
   if (_supports_android) {
     if (_chromium_code) {
-      _final_datadeps += [ ":${_template_name}__lint" ]
+      _has_lint_target = true
       android_lint("${_template_name}__lint") {
         android_manifest = _android_manifest
         build_config = _build_config
         jar_path = _jar_path
         java_files = _java_files
         deps = build_config_deps + [ ":$_compile_java_target" ]
         if (defined(invoker.deps)) {
           deps += invoker.deps
         }
       }
 
       if (_run_findbugs) {
-        _final_datadeps += [ ":${_template_name}__findbugs" ]
         findbugs("${_template_name}__findbugs") {
           build_config = _build_config
           jar_path = _jar_path
           deps = build_config_deps + [ ":$_compile_java_target" ]
         }
       }
+
+      # Use an intermediate group() rather as the data_deps target in order to
+      # avoid lint artifacts showing up as runtime_deps (while still having lint
+      # run in parallel to other targets).
+      group("${_template_name}__analysis") {
+        public_deps = [
+          ":${_template_name}__lint",
+        ]
+        if (_run_findbugs) {
+          public_deps += [ ":${_template_name}__findbugs" ]
+        }
+      }
     }
 
     _final_deps += [ ":${_template_name}__dex" ]
     dex("${_template_name}__dex") {
       sources = [
         _jar_path,
       ]
       output = _dex_path
       deps = [
         ":$_compile_java_target",
       ]
     }
   }
 
   group(target_name) {
-    forward_variables_from(invoker, [ "visibility" ])
+    data_deps = []
+    forward_variables_from(invoker,
+                           [
+                             "data_deps",
+                             "visibility",
+                           ])
     public_deps = _final_deps
-    data_deps = _final_datadeps
+    if (_has_lint_target) {
+      data_deps += [ ":${_template_name}__analysis" ]
+    }
   }
 }
 
 # Runs process_resources.py
 template("process_resources") {
   set_sources_assignment_filter([])
   forward_variables_from(invoker, [ "testonly" ])
 
   zip_path = invoker.zip_path
   srcjar_path = invoker.srcjar_path
@@ skipping 406 matching lines @@
 
     args = [
       "--depfile",
       rebase_path(depfile, root_build_dir),
       "--script-output-path",
       rebase_path(generated_script, root_build_dir),
     ]
     args += test_runner_args
   }
 }