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

chrome/installer/installer.gyp

Index: chrome/installer/installer.gyp
===================================================================
--- chrome/installer/installer.gyp	(revision 17195)
+++ chrome/installer/installer.gyp	(working copy)
@@ -395,6 +395,24 @@
               ],
             },
           ],
+          # 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',
@@ -521,6 +539,24 @@
               ],
             },
           ],
+          # 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',
+              },
+            }],
+          ],
         },
       ],
     }],