Merge 145477 - build fix

chrome/chrome_installer.gypi

 # 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.
 
 {
   'variables': {
     'lastchange_path': '../build/util/LASTCHANGE',
     # 'branding_dir' is set in the 'conditions' section at the bottom.
   },
   'conditions': [
@@ skipping 314 matching lines @@
             # TODO(mark):  <(branding_dir) 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.
             [ 'branding == "Chrome"', {
               'variables': {
                  'branding_dir': 'app/theme/google_chrome',
+                 'branding_dir_100': 'app/theme/default_100_percent/google_chrome',
               },
             }, { # else branding!="Chrome"
               'variables': {
                  'branding_dir': 'app/theme/chromium',
+                 'branding_dir_100': 'app/theme/default_100_percent/chromium',
               },
             }],
           ],
         },
         {
           'target_name': 'setup_unittests',
           'type': 'executable',
           'dependencies': [
             'installer_util',
             'installer_util_strings',
@@ skipping 66 matching lines @@
               ],
             },
           ],
         },
       ],
     }],
     ['OS=="linux" and branding=="Chrome"', {
       'variables': {
         # Always google_chrome since this only applies to branding==Chrome.
         'branding_dir': 'app/theme/google_chrome',
+        'branding_dir_100': 'app/theme/default_100_percent/google_chrome',
         'version' : '<!(python <(version_py_path) -f ../chrome/VERSION -t "@MAJOR@.@MINOR@.@BUILD@.@PATCH@")',
         'revision' : '<!(python ../build/util/lastchange.py --revision-only)',
         'packaging_files_common': [
           'installer/linux/internal/common/apt.include',
           'installer/linux/internal/common/default-app.template',
           'installer/linux/internal/common/default-app-block.template',
           'installer/linux/internal/common/desktop.template',
           'installer/linux/internal/common/google-chrome/google-chrome.info',
           'installer/linux/internal/common/installer.include',
           'installer/linux/internal/common/postinst.include',
@@ skipping 92 matching lines @@
             {
               'destination': '<(PRODUCT_DIR)/installer/common/',
               'files': [
                 '<@(packaging_files_common)',
               ]
             },
             # Additional theme resources needed for package building.
             {
               'destination': '<(PRODUCT_DIR)/installer/theme/',
               'files': [
-                'default_100_percent/<(branding_dir)/product_logo_16.png',
+                '<(branding_dir_100)/product_logo_16.png',
                 '<(branding_dir)/product_logo_22.png',
                 '<(branding_dir)/product_logo_24.png',
-                'default_100_percent/<(branding_dir)/product_logo_32.png',
+                '<(branding_dir_100)/product_logo_32.png',
                 '<(branding_dir)/product_logo_48.png',
                 '<(branding_dir)/product_logo_64.png',
                 '<(branding_dir)/product_logo_128.png',
                 '<(branding_dir)/product_logo_256.png',
                 '<(branding_dir)/product_logo_32.xpm',
                 '<(branding_dir)/BRANDING',
               ],
             },
           ],
           'actions': [
@@ skipping 481 matching lines @@
           ],
           'sources': [
             'installer/gcapi_mac/gcapi_example_client.mm',
           ],
         },
       ],  # targets
     }],  # OS=="mac"
     [ 'branding == "Chrome"', {
       'variables': {
          'branding_dir': 'app/theme/google_chrome',
+         'branding_dir_100': 'app/theme/default_100_percent/google_chrome',
       },
     }, { # else branding!="Chrome"
       'variables': {
          'branding_dir': 'app/theme/chromium',
+         'branding_dir_100': 'app/theme/default_100_percent/chromium',
       },
     }],
   ],
 }