Convert GN hyphens to underscores when passing command line args.

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 61 matching lines @@
         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("-", "_")
     if len(tokens) == 2:
       # Escape $ characters which have special meaning to GN.
-      vars_dict[tokens[0]] = '"' + tokens[1].replace("$", "\\$") + '"'
+      vars_dict[key] = '"' + tokens[1].replace("$", "\\$") + '"'
     else:
       # No value supplied, treat it as a boolean and set it.
-      vars_dict[tokens[0]] = 'true'
+      vars_dict[key] = 'true'
 
   vars_string = ''
   for v in vars_dict:
     vars_string = vars_string + v + '=' + vars_dict[v] + ' '
   return vars_string.strip()  # Remove trailing space.
 
 
 def additional_include_files(supplemental_files, args=[]):
   """
   Returns a list of additional (.gypi) files to include, without duplicating
@@ skipping 166 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))