Adds the ability to skip includes.

pylib/gyp/input.py

 # Copyright (c) 2012 Google Inc. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 from compiler.ast import Const
 from compiler.ast import Dict
 from compiler.ast import Discard
 from compiler.ast import List
 from compiler.ast import Module
 from compiler.ast import Node
@@ skipping 211 matching lines @@
     gyp.common.ExceptionAppend(e, 'while reading ' + build_file_path)
     raise
 
   if not isinstance(build_file_data, dict):
     raise GypError("%s does not evaluate to a dictionary." % build_file_path)
 
   data[build_file_path] = build_file_data
   aux_data[build_file_path] = {}
 
   # Scan for includes and merge them in.
-  try:
-    if is_target:
-      LoadBuildFileIncludesIntoDict(build_file_data, build_file_path, data,
-                                    aux_data, variables, includes, check)
-    else:
-      LoadBuildFileIncludesIntoDict(build_file_data, build_file_path, data,
-                                    aux_data, variables, None, check)
-  except Exception, e:
-    gyp.common.ExceptionAppend(e,
-                               'while reading includes of ' + build_file_path)
-    raise
+  if ('skip_includes' not in build_file_data or
+      not build_file_data['skip_includes']):

[Nico, 2013/10/15 17:12:50]

This maybe doesn't have to be so general. Your generated gyp files won't have
'include' sections, the only thing you care about is that build/gyp_chromium
adds a -Ibuild/common.gypi which you don't want for gyp files written by gn.

Where will gn write its gyp files to? Probably somewhere in its output
directory? How will higher-up gyp files depend on a gn-written gyp file? How
will these generated gyp files be converted to ninja files?

Maybe build/gyp_chromium could detect if it's processing gn-generated ninja
files and not add the -I switch in that case (which would require that they are
processed in a second pass, independent of the regular gyp files, but that's
maybe what's going to happen anyhow.)

[brettw, 2013/10/15 17:20:02]

GYP files that depend on this would just name the GYP file. There is nothing
special. Currently the GYP files are just written to the source tree. I will
likely add a new directory, but that would mean we need to update the GYP files
to reference that new directory.

There isn't a second pass for GN-generated ones. Everything is generated at once
which allows libraries and settings to flow through the dependency tree like
normal.

+    try:
+      if is_target:
+        LoadBuildFileIncludesIntoDict(build_file_data, build_file_path, data,
+                                      aux_data, variables, includes, check)
+      else:
+        LoadBuildFileIncludesIntoDict(build_file_data, build_file_path, data,
+                                      aux_data, variables, None, check)
+    except Exception, e:
+      gyp.common.ExceptionAppend(e,
+                                 'while reading includes of ' + build_file_path)
+      raise
 
   return build_file_data
 
 
 def LoadBuildFileIncludesIntoDict(subdict, subdict_path, data, aux_data,
                                   variables, includes, check):
   includes_list = []
   if includes != None:
     includes_list.extend(includes)
   if 'includes' in subdict:
@@ skipping 2489 matching lines @@
     ValidateRunAsInTarget(target, target_dict, build_file)
     ValidateActionsInTarget(target, target_dict, build_file)
 
   # Generators might not expect ints.  Turn them into strs.
   TurnIntIntoStrInDict(data)
 
   # TODO(mark): Return |data| for now because the generator needs a list of
   # build files that came in.  In the future, maybe it should just accept
   # a list, and not the whole data dict.
   return [flat_list, targets, data]