Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(285)

Unified Diff: third_party/widevine/cdm/widevine_cdm.gyp

Issue 1105633003: just some of possible refactorings possible after inventing branding_path_component (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/media_cdm.gypi ('k') | win8/metro_driver/metro_driver.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/widevine/cdm/widevine_cdm.gyp
diff --git a/third_party/widevine/cdm/widevine_cdm.gyp b/third_party/widevine/cdm/widevine_cdm.gyp
index ac455476fce9c344b3b5f6e7213b04102f461198..97a416518bfb4063443695365f665d6870fa5acd 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
« no previous file with comments | « media/media_cdm.gypi ('k') | win8/metro_driver/metro_driver.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698