diff options
| author | gburanov <gburanov@gmail.com> | 2015-04-28 05:17:33 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-04-28 12:17:33 +0000 |
| commit | be076f940c3d02a690b876095eca988bb49d1930 (patch) | |
| tree | d30203193fff6262c6d700f82dc8064931c4c7b1 /cloud_print/cloud_print_resources.gyp | |
| parent | 49180eb13549e440bbd4f66390e32e84699dcdfd (diff) | |
| download | chromium_src-be076f940c3d02a690b876095eca988bb49d1930.zip chromium_src-be076f940c3d02a690b876095eca988bb49d1930.tar.gz chromium_src-be076f940c3d02a690b876095eca988bb49d1930.tar.bz2 | |
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}
Diffstat (limited to 'cloud_print/cloud_print_resources.gyp')
| -rw-r--r-- | cloud_print/cloud_print_resources.gyp | 24 |
1 files changed, 2 insertions, 22 deletions
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', |