💂 GN: Fix java_library() when supplied with a generated .java

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 1448 matching lines @@
 }
 
 # Compiles and jars a set of java files.
 #
 # Outputs:
 #  $jar_path.jar
 #  $jar_path.interface.jar
 #
 # Variables
 #   java_files: List of .java files to compile.
-#   java_deps: List of java dependencies. These should all have a .jar output
-#     at "${target_gen_dir}/${target_name}.jar.
 #   chromium_code: If true, enable extra warnings.
 #   srcjar_deps: List of srcjar dependencies. The .java files contained in the
 #     dependencies srcjar outputs will be compiled and added to the output jar.
 #   jar_path: Use this to explicitly set the output jar path. Defaults to
 #     "${target_gen_dir}/${target_name}.jar.
 template("compile_java") {
   set_sources_assignment_filter([])
   forward_variables_from(invoker, [ "testonly" ])
 
   assert(defined(invoker.java_files))
@@ skipping 175 matching lines @@
     public_deps = [
       ":$_emma_instr_target_name",
       ":$_ijar_target_name",
     ]
   }
 }
 
 template("java_library_impl") {
   set_sources_assignment_filter([])
   forward_variables_from(invoker, [ "testonly" ])
+  _accumulated_deps = []
+  if (defined(invoker.deps)) {
+    _accumulated_deps = invoker.deps
+  }
 
   assert(defined(invoker.java_files) || defined(invoker.srcjars) ||
          defined(invoker.srcjar_deps))
   _base_path = "$target_gen_dir/$target_name"
 
   # Jar files can be needed at runtime (by Robolectric tests or java binaries),
   # so do not put them under gen/.
   _jar_name = target_name
   if (defined(invoker.jar_name)) {
     _jar_name = invoker.jar_name
@@ skipping 43 matching lines @@
     _dex_path = _base_path + ".dex.jar"
     if (defined(invoker.dex_path)) {
       _dex_path = invoker.dex_path
     }
   }
 
   # Define build_config_deps which will be a list of targets required to
   # build the _build_config.
   if (defined(invoker.override_build_config)) {
     _build_config = invoker.override_build_config
-
-    # When a custom build config file is specified, we need to use the deps
-    # supplied by the invoker any time we reference the build config file.
-    assert(defined(invoker.deps),
-           "If you specify a build config file for " +
-               "java_library_impl($target_name), you should " +
-               "also specify the target that made it in the deps")
-    build_config_deps = invoker.deps
   } else {
     _build_config = _base_path + ".build_config"
     build_config_target_name = "${_template_name}__build_config"
-    build_config_deps = [ ":$build_config_target_name" ]
 
     write_build_config(build_config_target_name) {
-      forward_variables_from(invoker, [ "deps" ])
+      deps = _accumulated_deps
       if (defined(invoker.is_java_binary) && invoker.is_java_binary) {
         type = "java_binary"
       } else {
         type = "java_library"
       }
       supports_android = _supports_android
       requires_android = _requires_android
       bypass_platform_checks = defined(invoker.bypass_platform_checks) &&
                                invoker.bypass_platform_checks
 
       build_config = _build_config
       jar_path = _jar_path
       if (_supports_android) {
         dex_path = _dex_path
       }
     }
+    _accumulated_deps += [ ":$build_config_target_name" ]
   }
 
   _srcjar_deps = []
   if (defined(invoker.srcjar_deps)) {
     _srcjar_deps = invoker.srcjar_deps
   }
 
   _srcjars = []
   if (defined(invoker.srcjars)) {
     _srcjars = invoker.srcjars
@@ skipping 21 matching lines @@
                              "proguard_preprocess",
                            ])
     jar_path = _jar_path
     build_config = _build_config
     java_files = _java_files
     srcjar_deps = _srcjar_deps
     srcjars = _srcjars
     chromium_code = _chromium_code
     supports_android = _supports_android
     emma_instrument = _emma_instrument
-    deps = build_config_deps
+    deps = _accumulated_deps
   }
+  _accumulated_deps += [ ":$_compile_java_target" ]
+  assert(_accumulated_deps != [])  # Mark used.
 
   if (defined(invoker.main_class)) {
     # Targets might use the generated script while building, so make it a dep
     # rather than a data_dep.
     _final_deps += [ ":${_template_name}__java_binary_script" ]
     java_binary_script("${_template_name}__java_binary_script") {
       forward_variables_from(invoker,
                              [
                                "bootclasspath",
                                "main_class",
                                "wrapper_script_args",
                              ])
       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
+      deps = _accumulated_deps
     }
   }
 
   _has_lint_target = false
   if (_supports_android) {
     if (_chromium_code) {
       _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
-        }
+        deps = _accumulated_deps
       }
 
       if (_run_findbugs) {
         findbugs("${_template_name}__findbugs") {
           build_config = _build_config
           jar_path = _jar_path
-          deps = build_config_deps + [ ":$_compile_java_target" ]
+          deps = _accumulated_deps
         }
       }
 
       # 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",
         ]
@@ skipping 466 matching lines @@
 
     args = [
       "--depfile",
       rebase_path(depfile, root_build_dir),
       "--script-output-path",
       rebase_path(generated_script, root_build_dir),
     ]
     args += test_runner_args
   }
 }