Fix handling of GYP defines from supplemental files.

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 66 matching lines @@
 
   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]) + '"'
+        vars_dict[FormatKeyForGN(v)] = '"' + \
+            str(variables[v]).replace("$", "\\$") + '"'
 
   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:
       # Escape $ characters which have special meaning to GN.
       vars_dict[key] = '"' + tokens[1].replace("$", "\\$") + '"'
@@ skipping 179 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))