Don't write deps that GN already knows about to .d files

build/android/gyp/util/build_utils.py

 # Copyright 2013 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 ast
 import contextlib
 import fnmatch
 import json
 import os
 import pipes
@@ skipping 453 matching lines @@
       expansion = expansion[k]
 
     new_args[i] = arg[:match.start()] + str(expansion)
 
   return new_args
 
 
 def CallAndWriteDepfileIfStale(function, options, record_path=None,
                                input_paths=None, input_strings=None,
                                output_paths=None, force=False,
-                               pass_changes=False):
+                               pass_changes=False,
+                               depfile_deps=None):
   """Wraps md5_check.CallAndRecordIfStale() and also writes dep & stamp files.
 
   Depfiles and stamp files are automatically added to output_paths when present
   in the |options| argument. They are then created after |function| is called.
+
+  By default, only python dependencies are added to the depfile. If there are
+  other input paths that are not captured by GN deps, then they should be listed
+  in depfile_deps. It's important to write paths to the depfile that are already
+  captured by GN deps since GN args can cause GN deps to change, and such
+  changes are not immediately reflected in depfiles (http://crbug.com/589311).
   """
   if not output_paths:
     raise Exception('At least one output_path must be specified.')
   input_paths = list(input_paths or [])
   input_strings = list(input_strings or [])
   output_paths = list(output_paths or [])
 
   python_deps = None
   if hasattr(options, 'depfile') and options.depfile:
     python_deps = GetPythonDependencies()
     # List python deps in input_strings rather than input_paths since the
     # contents of them does not change what gets written to the depfile.
     input_strings += python_deps
     output_paths += [options.depfile]
 
   stamp_file = hasattr(options, 'stamp') and options.stamp
   if stamp_file:
     output_paths += [stamp_file]
 
   def on_stale_md5(changes):
     args = (changes,) if pass_changes else ()
     function(*args)
     if python_deps is not None:
-      WriteDepfile(options.depfile, python_deps + input_paths)

[jbudorick, 2016/03/09 16:31:08]

What happened to input_paths?

[agrieve, 2016/03/11 15:21:13]

That's the fix. Have a look at the new comment I added about depfile_deps.

[jbudorick, 2016/03/11 15:24:17]

definitely skipped right through that comment the first time.

+      all_depfile_deps = list(python_deps)
+      if depfile_deps:
+        all_depfile_deps.extend(depfile_deps)
+      WriteDepfile(options.depfile, all_depfile_deps)
     if stamp_file:
       Touch(stamp_file)
 
   md5_check.CallAndRecordIfStale(
       on_stale_md5,
       record_path=record_path,
       input_paths=input_paths,
       input_strings=input_strings,
       output_paths=output_paths,
       force=force,
       pass_changes=True)