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 5c6b9f9a35475fe57465a23b8d28d62537083a3f..dddc54823927fef6f9204b7a0f1640a2956673b2 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -91,6 +91,7 @@
 
           # Override branding to select the desired branding flavor.
           'branding%': 'Chromium',
+          'branding_path_component%': 'chromium',

[sdefresne, 2015/04/17 13:41:28]

You can remove this one.

 
           'conditions': [
             # ChromeOS and Windows use Aura and Ash.
@@ -146,6 +147,7 @@
         'enable_hidpi%': '<(enable_hidpi)',
         'buildtype%': '<(buildtype)',
         'branding%': '<(branding)',
+        'branding_path_component%': '<(branding_path_component)',

[sdefresne, 2015/04/17 13:41:28]

Should be: 'branding_path_component%': 'chromium',

         'host_arch%': '<(host_arch)',
         'target_arch%': '<(target_arch)',
 
@@ -185,6 +187,12 @@
         'mips_dsp_rev%': 0,
 
         'conditions': [
+            ['branding == "Chrome"', {
+              'branding_path_component%': 'google_chrome',
+            }, {
+              'branding_path_component%': '<(branding)',
+            }],
+
           # Ash needs Aura.
           ['use_aura==0', {
             'use_ash%': 0,
@@ -292,6 +300,7 @@
       'use_default_render_theme%': '<(use_default_render_theme)',
       'buildtype%': '<(buildtype)',
       'branding%': '<(branding)',
+       'branding_path_component%': '<(branding_path_component)',

[sdefresne, 2015/04/17 13:41:28]

Fix indentation here and everywhere else.

       'arm_version%': '<(arm_version)',
       'sysroot%': '<(sysroot)',
       'chroot_cmd%': '<(chroot_cmd)',
@@ -1077,6 +1086,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)',