Use the variable "branding_path_component" to locate brand-specific files and

resources in installer gyp files.

Please take look at
https://codereview.chromium.org/1090213002/patch/40001/50001

for details

BUG=

Review URL: https://codereview.chromium.org/1109523002

Cr-Commit-Position: refs/heads/master@{#327042}

4 files changed, 4 insertions, 57 deletions

diff --git a/chrome/installer/installer_tools.gyp b/chrome/installer/installer_tools.gyp
index fea3d48..3033e21 100644
--- a/chrome/installer/installer_tools.gyp
+++ b/chrome/installer/installer_tools.gyp
@@ -7,7 +7,7 @@
     'version_py': '<(DEPTH)/build/util/version.py',
     'version_path': '<(DEPTH)/chrome/VERSION',
     'lastchange_path': '<(DEPTH)/build/util/LASTCHANGE',
-    # 'branding_dir' is set in the 'conditions' section at the bottom.
+    'branding_dir': '<(DEPTH)/chrome/app/theme/<(branding_path_component)',
     'msvs_use_common_release': 0,
     'msvs_use_common_linker_extras': 0,
   },
@@ -34,14 +34,5 @@
         },
       ],
     }],
-    [ 'branding == "Chrome"', {
-      'variables': {
-         'branding_dir': '<(DEPTH)/chrome/app/theme/google_chrome',
-      },
-    }, { # else branding!="Chrome"
-      'variables': {
-         'branding_dir': '<(DEPTH)/chrome/app/theme/chromium',
-      },
-    }],
   ],
 }
diff --git a/chrome/installer/mini_installer.gyp b/chrome/installer/mini_installer.gyp
index fdbd85d..76e72ee 100644
--- a/chrome/installer/mini_installer.gyp
+++ b/chrome/installer/mini_installer.gyp
@@ -3,7 +3,7 @@
     'version_py': '<(DEPTH)/build/util/version.py',
     'version_path': '../../chrome/VERSION',
     'lastchange_path': '<(DEPTH)/build/util/LASTCHANGE',
-    # 'branding_dir' is set in the 'conditions' section at the bottom.
+    'branding_dir': '../app/theme/<(branding_path_component)',
     'msvs_use_common_release': 0,
     'msvs_use_common_linker_extras': 0,
     'mini_installer_internal_deps%': 0,
@@ -298,24 +298,6 @@
               'message': 'Create installer archive',
             },
           ],
-          # 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.
-          'conditions': [
-            [ 'branding == "Chrome"', {
-              'variables': {
-                 'branding_dir': '../app/theme/google_chrome',
-              },
-            }, { # else branding!="Chrome"
-              'variables': {
-                 'branding_dir': '../app/theme/chromium',
-              },
-            }],
-          ],
         },
       ],
       'conditions': [
@@ -338,14 +320,5 @@
         }],
       ],
     }],
-    [ 'branding == "Chrome"', {
-      'variables': {
-         'branding_dir': '../app/theme/google_chrome',
-      },
-    }, { # else branding!="Chrome"
-      'variables': {
-         'branding_dir': '../app/theme/chromium',
-      },
-    }],
   ],
 }
diff --git a/chrome/installer/mini_installer_syzygy.gyp b/chrome/installer/mini_installer_syzygy.gyp
index 4d19617..db7f5c8 100644
--- a/chrome/installer/mini_installer_syzygy.gyp
+++ b/chrome/installer/mini_installer_syzygy.gyp
@@ -6,7 +6,7 @@
     'version_py': '<(DEPTH)/build/util/version.py',
     'version_path': '<(DEPTH)/chrome/VERSION',
     'lastchange_path': '<(DEPTH)/build/util/LASTCHANGE',
-    # 'branding_dir' is set in the 'conditions' section at the bottom.
+    'branding_dir': '../app/theme/<(branding_path_component)',
     'msvs_use_common_release': 0,
     'msvs_use_common_linker_extras': 0,
   },
@@ -64,14 +64,5 @@
     },{
       'targets': [],
     }],
-    [ 'branding == "Chrome"', {
-      'variables': {
-         'branding_dir': '../app/theme/google_chrome',
-      },
-    }, {  # else branding!="Chrome"
-      'variables': {
-         'branding_dir': '../app/theme/chromium',
-      },
-    }],
   ],
 }
diff --git a/chrome/installer/upgrade_test.gyp b/chrome/installer/upgrade_test.gyp
index 061604e..bccc94d 100644
--- a/chrome/installer/upgrade_test.gyp
+++ b/chrome/installer/upgrade_test.gyp
@@ -4,6 +4,7 @@
 
 {
   'variables': {
+    'branding_dir': '../app/theme/<(branding_path_component)',
     'version_py': '<(DEPTH)/build/util/version.py',
     'version_path': '../../chrome/VERSION',
     'lastchange_path': '<(DEPTH)/build/util/LASTCHANGE',
@@ -87,14 +88,5 @@
         },
       ],
     }],
-    [ 'branding == "Chrome"', {
-      'variables': {
-         'branding_dir': '../app/theme/google_chrome',
-      },
-    }, { # else branding!="Chrome"
-      'variables': {
-         'branding_dir': '../app/theme/chromium',
-      },
-    }],
   ],
 }