diff options
| -rw-r--r-- | chrome_elf/chrome_elf.gyp | 12 | ||||
| -rw-r--r-- | cloud_print/cloud_print_resources.gyp | 24 | ||||
| -rw-r--r-- | media/media_cdm.gypi | 12 |
3 files changed, 4 insertions, 44 deletions
diff --git a/chrome_elf/chrome_elf.gyp b/chrome_elf/chrome_elf.gyp index 0b612a8..cbbb4b4 100644 --- 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 index dfa8bc6..4057d23 100644 --- 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 index 7d92732..1068aa1 100644 --- 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' ], |