diff options
| author | gburanov <gburanov@gmail.com> | 2015-04-24 23:31:44 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-04-25 06:31:47 +0000 |
| commit | b66e2521c9f936725c78f5bcf266afa6c2a30cee (patch) | |
| tree | 7cfcd9a9329a5aa5556a5620012a22c58351929d | |
| parent | d6185128f992fb93bde77718c36a1cd8aec58dd9 (diff) | |
| download | chromium_src-b66e2521c9f936725c78f5bcf266afa6c2a30cee.zip chromium_src-b66e2521c9f936725c78f5bcf266afa6c2a30cee.tar.gz chromium_src-b66e2521c9f936725c78f5bcf266afa6c2a30cee.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/1106503003
Cr-Commit-Position: refs/heads/master@{#326963}
| -rw-r--r-- | third_party/widevine/cdm/widevine_cdm.gyp | 12 | ||||
| -rw-r--r-- | win8/metro_driver/metro_driver.gyp | 12 |
2 files changed, 2 insertions, 22 deletions
diff --git a/third_party/widevine/cdm/widevine_cdm.gyp b/third_party/widevine/cdm/widevine_cdm.gyp index ac45547..97a4165 100644 --- a/third_party/widevine/cdm/widevine_cdm.gyp +++ b/third_party/widevine/cdm/widevine_cdm.gyp @@ -69,19 +69,9 @@ # GN version: //third_party/widevine/cdm:widevinecdmadapter_resources 'target_name': 'widevinecdmadapter_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', 'BRANDING' ], 'extra_variable_files': [ 'BRANDING' ], # NOTE: matches that above diff --git a/win8/metro_driver/metro_driver.gyp b/win8/metro_driver/metro_driver.gyp index ce09c1d..1a815e4 100644 --- a/win8/metro_driver/metro_driver.gyp +++ b/win8/metro_driver/metro_driver.gyp @@ -31,19 +31,9 @@ { 'target_name': 'metro_driver_version_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': 'metro_driver', + 'branding_path': '../../chrome/app/theme/<(branding_path_component)/BRANDING', 'template_input_path': '../../chrome/app/chrome_version.rc.version', }, 'sources': [ |