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

Unified Diff: chromecast/chromecast.gyp

Issue 945903004: Chromecast: adds application and WebUI resources for internal build. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromecast/chromecast.gyp
diff --git a/chromecast/chromecast.gyp b/chromecast/chromecast.gyp
index f48a6c3dbca7c08885d756949e24dc04318a9ce7..e58218e85dc5663616a65e7f132cf1c99ab82550 100644
--- a/chromecast/chromecast.gyp
+++ b/chromecast/chromecast.gyp
@@ -10,6 +10,7 @@
'chromium_code': 1,
'chromecast_branding%': 'Chromium',
'disable_display%': 0,
+ 'use_chromecast_webui%': 0,
},
'includes': [
'chromecast_tests.gypi',
@@ -129,12 +130,28 @@
'<(SHARED_INTERMEDIATE_DIR)/ui/strings/app_locale_settings_en-US.pak',
'<(SHARED_INTERMEDIATE_DIR)/ui/strings/ui_strings_en-US.pak',
],
+ 'conditions': [
+ ['chromecast_branding=="Chrome" and use_chromecast_webui==1', {
+ 'pak_inputs': [
+ '<(SHARED_INTERMEDIATE_DIR)/chromecast/app_resources.pak',
+ '<(SHARED_INTERMEDIATE_DIR)/chromecast/cast_webui_resources.pak',
+ ],
+ }],
+ ],
'pak_output': '<(PRODUCT_DIR)/assets/cast_shell.pak',
},
'includes': [ '../build/repack_action.gypi' ],
},
],
- },
+ 'conditions': [
+ ['chromecast_branding=="Chrome" and use_chromecast_webui==1', {
+ 'dependencies': [
+ 'internal/chromecast_resources.gyp:chromecast_app_resources',
+ 'internal/chromecast_resources.gyp:chromecast_webui_resources',
+ ],
+ }],
+ ],
+ }, # end of target 'cast_shell_pak'
# This target contains all content-embedder implementation that is
# non-platform-specific.
{
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698