Add duplicate 'conditions' blocks that define the '<(BRANDING)'...

chrome/installer/installer.gyp

 {
   'variables': {
     'version_py': '../../chrome/tools/build/version.py',
     'VERSION': '../../chrome/VERSION',
     # 'BRANDING' is set in the 'conditions' section at the bottom.
   },
   'includes': [
     '../../build/common.gypi',
   ],
   'targets': [
@@ skipping 377 matching lines @@
                 'python',
                 '<(create_installer_archive_py_path)',
                 '--output_dir=<(PRODUCT_DIR)',
                 '--input_file=<(RULE_INPUT_PATH)',
                 # TODO(sgk):  may just use environment variables
                 #'--distribution=$(CHROMIUM_BUILD)',
                 '--distribution=_google_chrome',
               ],
             },
           ],
+          # TODO(mmentovai):  <(BRANDING) should be defined by the
+          # global condition block at the bottom of the file, but
+          # this doesn't work due to the following issue:
+          #
+          #   http://code.google.com/p/gyp/issues/detail?id=22
+          #
+          # Remove this block once the above issue is fixed.
+          'conditions': [
+            [ 'branding == "Chrome"', {
+              'variables': {
+                 'BRANDING': '../../chrome/app/theme/google_chrome/BRANDING',
+              },
+            }, { # else branding!="Chrome"
+              'variables': {
+                 'BRANDING': '../../chrome/app/theme/chromium/BRANDING',
+              },
+            }],
+          ],
         },
         {
           'target_name': 'mini_installer_test',
           'type': 'executable',
           'msvs_guid': '4B6E199A-034A-49BD-AB93-458DD37E45B1',
           'dependencies': [
             'installer_util',
             '../../base/base.gyp:base',
             '../../testing/gtest.gyp:gtest',
           ],
@@ skipping 106 matching lines @@
                 '<(scan_server_dlls_py)',
                 '--output_dir=<(INTERMEDIATE_DIR)',
                 '--input_file=<(RULE_INPUT_PATH)',
                 '--header_output_dir=<(INTERMEDIATE_DIR)',
                 # TODO(sgk):  may just use environment variables
                 #'--distribution=$(CHROMIUM_BUILD)',
                 '--distribution=_google_chrome',
               ],
             },
           ],
+          # TODO(mmentovai):  <(BRANDING) should be defined by the
+          # global condition block at the bottom of the file, but
+          # this doesn't work due to the following issue:
+          #
+          #   http://code.google.com/p/gyp/issues/detail?id=22
+          #
+          # Remove this block once the above issue is fixed.
+          'conditions': [
+            [ 'branding == "Chrome"', {
+              'variables': {
+                 'BRANDING': '../../chrome/app/theme/google_chrome/BRANDING',
+              },
+            }, { # else branding!="Chrome"
+              'variables': {
+                 'BRANDING': '../../chrome/app/theme/chromium/BRANDING',
+              },
+            }],
+          ],
         },
       ],
     }],
     [ 'branding == "Chrome"', {
       'variables': {
          'BRANDING': '../../chrome/app/theme/google_chrome/BRANDING',
       },
     }, { # else branding!="Chrome"
       'variables': {
          'BRANDING': '../../chrome/app/theme/chromium/BRANDING',
       },
     }],
   ],
 }