GN Command line -D parsing, goma on Windows

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 60 matching lines @@
   identifiers."""
   return ''.join([c if c in string.ascii_letters else '_' for c in key])
 
 
 def EscapeStringForGN(s):
   """Converts a string to a GN string literal."""
   # Escape $ characters which have special meaning to GN.
   return '"' + s.replace('$', '\\$').replace('"', '\\"') + '"'
 
 
+def ProcessGypDefinesItems(items):
+  """Converts a list of strings to a list of key-value pairs."""
+  result = []
+  for item in items:
+    tokens = item.split('=', 1)
+    # Some GYP variables have hyphens, which we don't support.
+    key = FormatKeyForGN(tokens[0])
+    if len(tokens) == 2:
+      result += [(key, tokens[1])]
+    else:
+      # No value supplied, treat it as a boolean and set it. Note that we
+      # use the string '1' here so we have a consistent definition whether
+      # you do 'foo=1' or 'foo'.
+      result += [(key, '1')]
+  return result
+
 def GetGypVarsForGN(supplemental_files):
   """Returns a dictionary of all GYP vars that we will be passing to GN."""
-  vars_dict = {}
 
+  # GYP defines from the supplemental.gypi files.
+  supp_items = []
   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[FormatKeyForGN(v)] = EscapeStringForGN(str(variables[v]))
+        supp_items += [(FormatKeyForGN(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 = FormatKeyForGN(tokens[0])
-    if len(tokens) == 2:
-      vars_dict[key] = tokens[1]
-    else:
-      # No value supplied, treat it as a boolean and set it.
-      vars_dict[key] = 'true'
+  # GYP defines from the environment.
+  env_items = ProcessGypDefinesItems(
+      shlex.split(os.environ.get('GYP_DEFINES', '')))
 
-  return vars_dict
+  # GYP defines from the command line. We can't use optparse since we want
+  # to ignore all arguments other than "-D".
+  cmdline_input_items = []
+  for i in range(len(sys.argv))[1:]:
+    if sys.argv[i] == '-D' and i + 1 < len(sys.argv):
+      cmdline_input_items += [sys.argv[i + 1]]
+  cmdline_items = ProcessGypDefinesItems(cmdline_input_items)
+
+  return dict(supp_items + env_items + cmdline_items)
 
 
 def GetArgsStringForGN(supplemental_files):
   """Returns the args to pass to GN.
   Based on a subset of the GYP variables that have been rewritten a bit."""
 
   vars_dict = GetGypVarsForGN(supplemental_files)
+  print vars_dict
   gn_args = ''
 
   # Note: These are the additional flags passed to various builds by builders
   # on the main waterfall. We'll probably need to add these at some point:
   #   mac_strip_release=1         http://crbug.com/330301
   #   linux_dump_symbols=0        http://crbug.com/330300
   #   host_os=linux  Probably can skip, GN knows the host OS.
   #   gcc_version=46  Hopefully we can skip this and fix whatever uses it.
   #   order_text_section=<path>   http://crbug.com/330299
   #   chromium_win_pch=0          http://crbug.com/297678
   #   clang_use_chrome_plugins=1  http://crbug.com/330298
   #   chromium_ios_signing=0      http://crbug.com/330302
   #   linux_use_tcmalloc=0        http://crbug.com/330303
   #   release_extra_flags=...     http://crbug.com/330305
 
   # These tuples of (key, value, gn_arg_string) use the gn_arg_string for
   # gn when the key is set to the given value in the GYP arguments.
   remap_cases = [
       ('branding', 'Chrome', 'is_chrome_branded=true'),
       ('buildtype', 'Official', 'is_official_build=true'),
       ('component', 'shared_library', 'is_component_build=true'),
       ('clang', '1', 'is_clang=true'),
       ('target_arch', 'ia32', 'cpu_arch="x86"'),
-      ('target_arch', 'x64', 'cpu_arch="x64"'),
+      ('target_arch', 'x64', 'cpu_arch="x64" force_win64=true'),
       ('target_arch', 'arm', 'cpu_arch="arm"'),
       ('target_arch', 'mipsel', 'cpu_arch="mipsel"'),
       ('fastbuild', '0', 'symbol_level=2'),
       ('fastbuild', '1', 'symbol_level=1'),
       ('fastbuild', '2', 'symbol_level=0'),
       ('OS', 'ios', 'os="ios"'),
       ('OS', 'android', 'os="android"'),
       ('chromeos', '1', 'os="chromeos"'),
       ('use_aura', '1', 'use_aura=true'),
+      ('use_goma', '1', 'use_goma=true'),
       ('asan', '1', 'is_asan=true'),
       ('lsan', '1', 'is_lsan=true'),
   ]
   for i in remap_cases:
     if i[0] in vars_dict and vars_dict[i[0]] == i[1]:
       gn_args += ' ' + i[2]
 
   # These string arguments get passed directly.
   for v in ['windows_sdk_path']:
     if v in vars_dict:
@@ skipping 180 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))