optimize branding - use branding_path_component variable for defining pranding specific paths

build/common.gypi

Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index 1f01db0371d0b868255387eeade06662caac2207..274e0f7683fe44c400ce79cff954f1b521eb5a50 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -146,6 +146,7 @@
         'enable_hidpi%': '<(enable_hidpi)',
         'buildtype%': '<(buildtype)',
         'branding%': '<(branding)',
+        'branding_path_component%': 'chromium',
         'host_arch%': '<(host_arch)',
         'target_arch%': '<(target_arch)',
 
@@ -185,6 +186,12 @@
         'mips_dsp_rev%': 0,
 
         'conditions': [
+            ['branding == "Chrome"', {
+              'branding_path_component%': 'google_chrome',
+            }, {
+              'branding_path_component%': '<(branding)',

[Michael Moss, 2015/04/21 15:11:53]

Default 'branding' is "Chromium", but the usages you're replacing are
"chromium", so if branding is unspecified, this will break on case-sensitive
file systems.

[gburanov, 2015/04/21 15:48:20]

No, just to clarify:

For Chromium:
branding_path_component: 'chromium'
branding: 'Chromium'

For Google Chrome
branding_path_component: 'google_chrome'
branding: 'Chrome'

For other brandings, branding_path_component = branding


Take a look at upper line 
'branding_path_component%': 'chromium',

[Michael Moss, 2015/04/21 17:21:20]

That just sets a default, which you then universally override here, by setting
it to either 'google_chrome' or '<(branding)'. This effectively makes the
default "branding_path_component" value == the default "branding" value, which
is 'Chromium', not 'chromium'. You can easily see this by running gyp_chromium
with different "branding" values (or no "branding" defined) and see what paths
are used in the output.

[gburanov, 2015/04/21 17:26:59]

yep, you are correct. sorry. I will fix it.

[gburanov, 2015/04/22 15:20:45]

Do you know how to make double if here?

            ['branding == "Chrome"', {
              'branding_path_component%': 'google_chrome',
            }, {
                 ['branding == "Chromium"', {
                   'branding_pathcomponent%': 'chromium',
                 }, {
                   'branding_path_component%': '<(branding)',
                 }]
            }],


This one is not working...

[Michael Moss, 2015/04/22 16:16:51]

You can wrap a 'conditions' inside a 'conditions', which is awkward, but I don't
know if there's any better way to basically do an 'if/else-if/else' in gyp,
like:

# if
['branding == "Chrome"', {
  'branding_path_component%': 'google_chrome',
}, {
  # else-if
  'conditions': [
    ['branding == "Chromium"', {
      'branding_path_component%': 'chromium',
    # else
    }, {
      'branding_path_component%': '<(branding)',
    }],
  ]
}],


Or maybe something like:

# Set the default above, where you currently set it to 'chromium'.
'branding_path_component%': '<(branding)',

# Then handle special cases (with no "else") in the 'conditions' block.
'conditions': [
  ['branding == "Chrome"', {
    'branding_path_component%': 'google_chrome',
  }],

  ['branding == "Chromium"', {
    'branding_path_component%': 'chromium',
  }],

+            }],
+
           # Ash needs Aura.
           ['use_aura==0', {
             'use_ash%': 0,
@@ -292,6 +299,7 @@
       'use_default_render_theme%': '<(use_default_render_theme)',
       'buildtype%': '<(buildtype)',
       'branding%': '<(branding)',
+      'branding_path_component%': '<(branding_path_component)',
       'arm_version%': '<(arm_version)',
       'sysroot%': '<(sysroot)',
       'chroot_cmd%': '<(chroot_cmd)',
@@ -1077,6 +1085,7 @@
 
     # Copy conditionally-set variables out one scope.
     'branding%': '<(branding)',
+    'branding_path_component%': '<(branding_path_component)',
     'buildtype%': '<(buildtype)',
     'target_arch%': '<(target_arch)',
     'target_subarch%': '<(target_subarch)',