Re-enable GN in the GYP build.

build/gyp_chromium

 #!/usr/bin/env python
 
 # Copyright (c) 2012 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.
 
 # This script is wrapper for Chromium that adds some support for how GYP
 # is invoked by Chromium beyond what can be done in the gclient hooks.
 
 import glob
@@ skipping 44 matching lines @@
 else:
   psyco = None
 
 
 def GetSupplementalFiles():
   """Returns a list of the supplemental files that are included in all GYP
   sources."""
   return glob.glob(os.path.join(chrome_src, '*', 'supplement.gypi'))
 
 
+def FormatKeyForGN(key):
+  """Returns the given GYP key reformatted for GN.
+
+  GYP dictionary keys can be almost anything, but in GN they are identifiers
+  and must follow the same rules. This reformats such keys to be valid GN
+  identifiers."""
+  ret = ''
+  for c in key:
+    if (c >= 'a' and c <= 'z') or (c >= 'A' and c <= 'Z'):

[Nico, 2013/12/04 18:15:20]

if c in string.ascii_letters, and add `import string` at the top

+      ret = ret + c

[Nico, 2013/12/04 18:15:20]

ret += c

+    else:
+      ret = ret + '_'

[Nico, 2013/12/04 18:15:20]

ret += '_'

+  return ret

[Nico, 2013/12/04 18:15:20]

I think the "more pythonic" way of writing this is:

  return [c if c in string.ascii_letters else '_' for c in key]

+
+
 def GetVarsStringForGN(supplemental_files):
   vars_dict = {}
 
   for supplement in supplemental_files:
     with open(supplement, 'r') as f:
       try:
         file_data = eval(f.read(), {'__builtins__': None}, None)
       except SyntaxError, e:
         e.filename = os.path.abspath(supplement)
         raise
       variables = file_data.get('variables')
       for v in variables:
         vars_dict[v] = '"' + str(variables[v]) + '"'
 
   env_string = os.environ.get('GYP_DEFINES', '')
   items = shlex.split(env_string)
   for item in items:
     tokens = item.split('=', 1)
     # Some GYP variables have hyphens, which we don't support.
-    key = tokens[0].replace("-", "_")
+    key = FormatKeyForGN(tokens[0])
     if len(tokens) == 2:
       # Escape $ characters which have special meaning to GN.
       vars_dict[key] = '"' + tokens[1].replace("$", "\\$") + '"'
     else:
       # No value supplied, treat it as a boolean and set it.
       vars_dict[key] = 'true'
 
   vars_string = ''
   for v in vars_dict:
     vars_string = vars_string + v + '=' + vars_dict[v] + ' '
@@ skipping 104 matching lines @@
     gyp_file = os.environ.get('CHROMIUM_GYP_FILE')
     if gyp_file:
       # Note that CHROMIUM_GYP_FILE values can't have backslashes as
       # path separators even on Windows due to the use of shlex.split().
       args.extend(shlex.split(gyp_file))
     else:
       args.append(os.path.join(script_dir, 'all.gyp'))
 
   supplemental_includes = GetSupplementalFiles()
 
-  # Temporarily disabled until it is debugged.
-  # TODO(brettw) re-enable this code.
-  #if not RunGN(supplemental_includes):
-  #  sys.exit(1)
+  if not RunGN(supplemental_includes):
+    sys.exit(1)
 
   args.extend(
       ['-I' + i for i in additional_include_files(supplemental_includes, args)])
 
   # There shouldn't be a circular dependency relationship between .gyp files,
   # but in Chromium's .gyp files, on non-Mac platforms, circular relationships
   # currently exist.  The check for circular dependencies is currently
   # bypassed on other platforms, but is left enabled on the Mac, where a
   # violation of the rule causes Xcode to misbehave badly.
   # TODO(mark): Find and kill remaining circular dependencies, and remove this
@@ skipping 46 matching lines @@
   # to enfore syntax checking.
   syntax_check = os.environ.get('CHROMIUM_GYP_SYNTAX_CHECK')
   if syntax_check and int(syntax_check):
     args.append('--check')
 
   print 'Updating projects from gyp files...'
   sys.stdout.flush()
 
   # Off we go...
   sys.exit(gyp.main(args))