simplify branding

Please take look at https://codereview.chromium.org/1090213002/patch/40001/50001 for details BUG= Review URL: https://codereview.chromium.org/1059333004 Cr-Commit-Position: refs/heads/master@{#327270}
marcosholgado · Apr 28, 2015 · be076f9 · be076f9
1 parent 49180eb
commit be076f9
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 44 deletions.
diff --git a/chrome_elf/chrome_elf.gyp b/chrome_elf/chrome_elf.gyp
@@ -15,19 +15,9 @@
     {
       'target_name': 'chrome_elf_resources',
       'type': 'none',
-      'conditions': [
-        ['branding == "Chrome"', {
-          'variables': {
-             'branding_path': '../chrome/app/theme/google_chrome/BRANDING',
-          },
-        }, { # else branding!="Chrome"
-          'variables': {
-             'branding_path': '../chrome/app/theme/chromium/BRANDING',
-          },
-        }],
-      ],
       'variables': {
         'output_dir': 'chrome_elf',
+        'branding_path': '../chrome/app/theme/<(branding_path_component)/BRANDING',
         'template_input_path': '../chrome/app/chrome_version.rc.version',
       },
       'sources': [

diff --git a/cloud_print/cloud_print_resources.gyp b/cloud_print/cloud_print_resources.gyp
@@ -19,19 +19,9 @@
     {
       'target_name': 'cloud_print_version_resources',
       'type': 'none',
-      'conditions': [
-        ['branding == "Chrome"', {
-          'variables': {
-             'branding_path': '<(DEPTH)/chrome/app/theme/google_chrome/BRANDING',
-          },
-        }, { # else branding!="Chrome"
-          'variables': {
-             'branding_path': '<(DEPTH)/chrome/app/theme/chromium/BRANDING',
-          },
-        }],
-      ],
       'variables': {
         'output_dir': 'cloud_print',
+        'branding_path': '<(DEPTH)/chrome/app/theme/<(branding_path_component)/BRANDING',
         'template_input_path': '../chrome/app/chrome_version.rc.version',
         'extra_variable_files_arguments': [ '-f', 'BRANDING' ],
         'extra_variable_files': [ 'BRANDING' ], # NOTE: matches that above
@@ -56,22 +46,12 @@
     {
       'target_name': 'cloud_print_version_header',
       'type': 'none',
-      'conditions': [
-        ['branding == "Chrome"', {
-          'variables': {
-             'branding_path': '<(DEPTH)/chrome/app/theme/google_chrome/BRANDING',
-          },
-        }, { # else branding!="Chrome"
-          'variables': {
-             'branding_path': '<(DEPTH)/chrome/app/theme/chromium/BRANDING',
-          },
-        }],
-      ],
       'hard_dependency': 1,
       'actions': [
         {
           'action_name': 'version_header',
           'variables': {
+            'branding_path': '<(DEPTH)/chrome/app/theme/<(branding_path_component)/BRANDING',
             'output_dir': 'cloud_print',
             'lastchange_path':
               '<(DEPTH)/build/util/LASTCHANGE',

diff --git a/media/media_cdm.gypi b/media/media_cdm.gypi
@@ -101,19 +101,9 @@
           # GN version: //media/cdm/ppapi:clearkeycdmadapter_resources
           'target_name': 'clearkeycdmadapter_resources',
           'type': 'none',
-          'conditions': [
-            ['branding == "Chrome"', {
-              'variables': {
-                'branding_path': '../chrome/app/theme/google_chrome/BRANDING',
-              },
-            }, { # else branding!="Chrome"
-              'variables': {
-                'branding_path': '../chrome/app/theme/chromium/BRANDING',
-              },
-            }],
-          ],
           'variables': {
             'output_dir': '.',
+            'branding_path': '../chrome/app/theme/<(branding_path_component)/BRANDING',
             'template_input_path': '../chrome/app/chrome_version.rc.version',
             'extra_variable_files_arguments':
               [ '-f', 'cdm/ppapi/external_clear_key/BRANDING' ],