Standardize grit invokes

build/common.gypi

 # Copyright (c) 2010 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.
 
 # IMPORTANT:
 # Please don't directly include this file if you are building via gyp_chromium,
 # since gyp_chromium is automatically forcing its inclusion.
 {
   # Variables expected to be overriden on the GYP command line (-D) or by
   # ~/.gyp/include.gypi.
@@ skipping 470 matching lines @@
         'libjpeg_gyp_path': '../third_party/libjpeg/libjpeg.gyp',
       }],  # use_libjpeg_turbo==1
 
       # Use GConf, the GNOME configuration system.
       ['chromeos==1', {
         'use_gconf%': 0,
       }, {
         'use_gconf%': 1,
       }],
 
-      # Setup -D flags passed into grit.
+      # Setup -D and -E flags passed into grit.

[Mark Mentovai, 2011/03/25 20:16:53]

Set up as a verb is two words.

       ['branding=="Chrome"', {
         # TODO(mmoss) The .grd files look for _google_chrome, but for
         # consistency they should look for google_chrome_build like C++.
-        'grit_defines': ['-D', '_google_chrome'],
+        'grit_defines': ['-D', '_google_chrome',
+                         '-E', 'CHROMIUM_BUILD=google_chrome'],
       }, {
-        'grit_defines': ['-D', '_chromium'],
+        'grit_defines': ['-D', '_chromium',
+                         '-E', 'CHROMIUM_BUILD=chromium'],
       }],
       ['chromeos==1', {
         'grit_defines': ['-D', 'chromeos'],
       }],
       ['toolkit_views==1', {
         'grit_defines': ['-D', 'toolkit_views'],
       }],
       ['touchui==1', {
         'grit_defines': ['-D', 'touchui'],
       }],
@@ skipping 1008 matching lines @@
             'AdditionalDependencies': [
               'wininet.lib',
               'dnsapi.lib',
               'version.lib',
               'msimg32.lib',
               'ws2_32.lib',
               'usp10.lib',
               'psapi.lib',
               'dbghelp.lib',
             ],
-            'conditions': [ 
+            'conditions': [
               ['msvs_express', {
                 # Explicitly required when using the ATL with express
                 'AdditionalDependencies': [
                   'atlthunk.lib',
                 ],
               }],
               ['MSVS_VERSION=="2005e"', {
                 # Non-express versions link automatically to these
                 'AdditionalDependencies': [
                   'advapi32.lib',
@@ skipping 121 matching lines @@
     # and therefore SYMROOT, needs to be set at the project level.
     'SYMROOT': '<(DEPTH)/xcodebuild',
   },
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: