Building cronet targets multiple times now reports "no work to do"

components/cronet/tools/jar_src.py

 #!/usr/bin/env python
 #
 # 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 optparse
 import os
 import sys
 import tempfile
@@ skipping 34 matching lines @@
       help='Directory containing .java files.')
   parser.add_option('--src-jars', action="append",
       help='A list of source jars to include in addition to source files.')
   parser.add_option('--jar-path', help='Jar output path.')
   parser.add_option('--stamp', help='Path to touch on success.')
 
   options, _ = parser.parse_args()
 
   # A temporary directory to put the output of jar files.
   unzipped_jar_path = None
+  generated_src_dirs = []
   if options.src_jars:
     unzipped_jar_path = tempfile.mkdtemp(dir=os.path.dirname(options.jar_path))
+    generated_src_dirs.append(unzipped_jar_path)
     jar_list = []
     for gn_list in options.src_jars:
       jar_list.extend(build_utils.ParseGnList(gn_list))
 
     for jar in jar_list:
       UnzipSourceJar(jar, unzipped_jar_path)
 
   src_dirs = []
   for src_dir in options.src_dir:
     src_dirs.extend(build_utils.ParseGnList(src_dir))
-  if unzipped_jar_path:
-    src_dirs += [unzipped_jar_path]
 
-  for src_dir in src_dirs:
+  for src_dir in src_dirs + generated_src_dirs:
     JarSources(src_dir, options.jar_path)
 
   if options.depfile:
     deps = []
     for src_dir in src_dirs:
       for root, _, filenames in os.walk(src_dir):
         deps.extend(os.path.join(root, f) for f in filenames)
+    # Srcjar deps already captured in GN rules (no need to list them here).

[xunjieli, 2016/09/14 19:43:42]

Srcjar deps aren't explicitly listed in the GN rule, that's why we do
build_utils.WriteDepfile() here right?
Or are you suggesting we do not need this step at all?

[agrieve, 2016/09/14 19:59:40]

This change marks the srcjar_deps as inputs to the action():
inputs = invoker.src_jars

[xunjieli, 2016/09/14 20:02:16]

If the dependency is added, can we get rid of line 73 - 79 then?

[agrieve, 2016/09/14 20:33:03]

The dependency in GN is only for generated files. We still need to list the
non-generated files in the depfile (or switch to listing them in GN. Right now
we just pass this script a directory)

[xunjieli, 2016/09/14 20:34:50]

Acknowledged. I see.

     build_utils.WriteDepfile(options.depfile, options.jar_path, deps)
 
   # Clean up temporary output directory.
   if unzipped_jar_path:
     build_utils.DeleteDirectory(unzipped_jar_path)
 
   if options.stamp:
     build_utils.Touch(options.stamp)
 
 if __name__ == '__main__':
   sys.exit(main())