Fix android depfiles to always list GN's outputs[0]

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 405 matching lines @@
 def AddDepfileOption(parser):
   # TODO(agrieve): Get rid of this once we've moved to argparse.
   if hasattr(parser, 'add_option'):
     func = parser.add_option
   else:
     func = parser.add_argument
   func('--depfile',
        help='Path to depfile. Must be specified as the action\'s first output.')
 
 
-def WriteDepfile(path, dependencies):
-  MakeDirectory(os.path.dirname(path))
-  with open(path, 'w') as depfile:
-    depfile.write(path)
+def WriteDepfile(depfile_path, first_gn_output, inputs=None, add_pydeps=True):
+  assert depfile_path != first_gn_output  # http://crbug.com/646165
+  inputs = inputs or []
+  if add_pydeps:
+    inputs = GetPythonDependencies() + inputs
+  MakeDirectory(os.path.dirname(depfile_path))
+  # Ninja does not support multiple outputs in depfiles.
+  with open(depfile_path, 'w') as depfile:
+    depfile.write(first_gn_output.replace(' ', '\\ '))

[jbudorick, 2016/09/13 21:43:27]

Heads up: this broke the (currently experimental) android_cronet bot:
https://build.chromium.org/p/tryserver.chromium.android/builders/android_cron...

though it didn't break any of the other android bots.

     depfile.write(': ')
-    depfile.write(' '.join(dependencies))
+    depfile.write(' '.join(i.replace(' ', '\\ ') for i in inputs))
     depfile.write('\n')
 
 
 def ExpandFileArgs(args):
   """Replaces file-arg placeholders in args.
 
   These placeholders have the form:
     @FileArg(filename:key1:key2:...:keyn)
 
   The value of such a placeholder is calculated by reading 'filename' as json.
@@ skipping 75 matching lines @@
   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:
       all_depfile_deps = list(python_deps)
       if depfile_deps:
         all_depfile_deps.extend(depfile_deps)
-      WriteDepfile(options.depfile, all_depfile_deps)
+      WriteDepfile(options.depfile, output_paths[0], all_depfile_deps,
+                   add_pydeps=False)
     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)