optimize branding - use branding_path_component variable for defining pranding specific paths

build/common.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.
 
 # IMPORTANT:
 # Please don't directly include this file if you are building via gyp_chromium,
 # since gyp_chromium is automatically forcing its inclusion.
 {
   # Variables expected to be overriden on the GYP command line (-D) or by
   # ~/.gyp/include.gypi.
@@ skipping 128 matching lines @@
         'use_cras%': '<(use_cras)',
         'use_ozone%': '<(use_ozone)',
         'embedded%': '<(embedded)',
         'use_libpci%': '<(use_libpci)',
         'use_openssl%': '<(use_openssl)',
         'use_openssl_certs%': '<(use_openssl_certs)',
         'enable_viewport%': '<(enable_viewport)',
         'enable_hidpi%': '<(enable_hidpi)',
         'buildtype%': '<(buildtype)',
         'branding%': '<(branding)',
+        'branding_path_component%': 'chromium',
         'host_arch%': '<(host_arch)',
         'target_arch%': '<(target_arch)',
 
         'target_subarch%': '',
 
         # The channel to build on Android: stable, beta, dev, canary, or
         # default. "default" should be used on non-official builds.
         'android_channel%': 'default',
 
         # Set ARM architecture version.
@@ skipping 19 matching lines @@
         # below for MIPS targets.
         'mips_arch_variant%': '',
 
         # MIPS DSP ASE revision. Possible values are:
         #   0: unavailable
         #   1: revision 1
         #   2: revision 2
         '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,
           }],
 
           # Set default value of toolkit_views based on OS.
           ['OS=="mac" or OS=="win" or chromeos==1 or use_aura==1', {
             'toolkit_views%': 1,
           }, {
             'toolkit_views%': 0,
@@ skipping 87 matching lines @@
       'use_openssl_certs%': '<(use_openssl_certs)',
       'enable_viewport%': '<(enable_viewport)',
       'enable_hidpi%': '<(enable_hidpi)',
       'android_channel%': '<(android_channel)',
       'use_goma%': '<(use_goma)',
       'gomadir%': '<(gomadir)',
       'enable_app_list%': '<(enable_app_list)',
       '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)',
       'system_libdir%': '<(system_libdir)',
 
       # Set to 1 to enable fast builds. Set to 2 for even faster builds
       # (it disables debug info for fastest compilation - only for use
       # on compile-only bots).
       'fastbuild%': 0,
 
@@ skipping 765 matching lines @@
       'disable_nacl%': '0',
 
       # Sets the default version name and code for Android app, by default we
       # do a developer build.
       'android_app_version_name%': 'Developer Build',
       'android_app_version_code%': 1,
     },
 
     # 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)',
     'mips_arch_variant%': '<(mips_arch_variant)',
     'mips_dsp_rev%': '<(mips_dsp_rev)',
     'host_arch%': '<(host_arch)',
     'toolkit_views%': '<(toolkit_views)',
     'ui_compositor_image_transport%': '<(ui_compositor_image_transport)',
     'use_aura%': '<(use_aura)',
     'use_ash%': '<(use_ash)',
@@ skipping 5049 matching lines @@
     # settings in target dicts.  SYMROOT is a special case, because many other
     # Xcode variables depend on it, including variables such as
     # PROJECT_DERIVED_FILE_DIR.  When a source group corresponding to something
     # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
     # files to appear (when present) in the UI as actual files and not red
     # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
     # and therefore SYMROOT, needs to be set at the project level.
     'SYMROOT': '<(DEPTH)/xcodebuild',
   },
 }