Fix branded resource buiding....

chrome/chrome.gyp

 # Copyright (c) 2009 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.
 
 {
   'variables': {
     'chromium_code': 1,
     # Define the common dependencies that contain all the actual
     # Chromium functionality.  This list gets pulled in below by
     # the link of the actual chrome (or chromium) executable on
@@ skipping 52 matching lines @@
         {
           'rule_name': 'grit',
           'extension': 'grd',
           'variables': {
             'conditions': [
               ['branding=="Chrome"', {
                 # TODO(mmoss) The .grd files look for _google_chrome, but for
                 # consistency they should look for GOOGLE_CHROME_BUILD like C++.
                 # Clean this up when Windows moves to gyp.
                 'chrome_build': '_google_chrome',
+                'branded_env': 'CHROMIUM_BUILD=google_chrome',
               }, {  # else: branding!="Chrome"
                 'chrome_build': '_chromium',
+                'branded_env': 'CHROMIUM_BUILD=chromium',
               }],
             ],
           },
           'inputs': [
             '../tools/grit/grit.py',
           ],
           'outputs': [
             '<(SHARED_INTERMEDIATE_DIR)/chrome/grit/<(RULE_INPUT_ROOT).h',
             '<(SHARED_INTERMEDIATE_DIR)/chrome/<(RULE_INPUT_ROOT).pak',
           ],
           'action': ['python', '<@(_inputs)', '-i', '<(RULE_INPUT_PATH)',
             'build', '-o', '<(SHARED_INTERMEDIATE_DIR)/chrome',
-            '-D', '<(chrome_build)'],
+            '-D', '<(chrome_build)',
+            '-E', '<(branded_env)',
+            ],
           'message': 'Generating resources from <(RULE_INPUT_PATH)',
         },
       ],
       'sources': [
         # Data resources.
         'browser/debugger/resources/debugger_resources.grd',
         'browser/browser_resources.grd',
         'common/common_resources.grd',
         'renderer/renderer_resources.grd',
       ],
@@ skipping 3792 matching lines @@
               # Use outputs of this action as inputs for the main target build.
               # Seems as a misnomer but makes this happy on Linux (scons).
               'process_outputs_as_sources': 1,
             },
           ],  # 'actions'
         },
       ]
     }],
   ],  # 'conditions'
 }