Chromium Code Reviews| Index: chromecast/chromecast.gyp |
| diff --git a/chromecast/chromecast.gyp b/chromecast/chromecast.gyp |
| index d08cf33cf930cf800e5a3e6865038e60bd4d0402..bda18c922214f01d7958dd295aa974f5c107252c 100644 |
| --- a/chromecast/chromecast.gyp |
| +++ b/chromecast/chromecast.gyp |
| @@ -22,8 +22,12 @@ |
| 'sources': [ |
| 'common/cast_paths.cc', |
| 'common/cast_paths.h', |
| + 'common/cast_resource_delegate.cc', |
| + 'common/cast_resource_delegate.h', |
| 'common/chromecast_config.cc', |
| 'common/chromecast_config.h', |
| + 'common/pref_names.cc', |
| + 'common/pref_names.h', |
|
lcwu1
2014/08/14 15:08:16
Ditto.
|
| ], |
| 'conditions': [ |
| ['chromecast_branding=="Chrome"', { |
| @@ -67,7 +71,18 @@ |
| { |
| 'target_name': 'cast_shell_resources', |
| 'type': 'none', |
| - # Place holder for cast_shell specific resources. |
| + 'variables': { |
| + 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chromecast', |
| + }, |
| + 'actions': [{ |
| + 'action_name': 'cast_shell_resources', |
| + 'variables': { |
| + 'grit_grd_file': 'shell/browser/resources/shell_resources.grd', |
| + 'grit_resource_ids': 'shell/browser/resources/resource_ids', |
| + }, |
| + 'includes': [ '../build/grit_action.gypi' ], |
| + }], |
| + 'includes': [ '../build/grit_target.gypi' ], |
| }, |
| { |
| 'target_name': 'cast_shell_pak', |
| @@ -89,6 +104,7 @@ |
| 'variables': { |
| 'pak_inputs': [ |
| '<(SHARED_INTERMEDIATE_DIR)/blink/public/resources/blink_resources.pak', |
| + '<(SHARED_INTERMEDIATE_DIR)/chromecast/shell_resources.pak', |
| '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.pak', |
| '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak', |
| '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_resources_100_percent.pak', |
| @@ -112,7 +128,10 @@ |
| 'cast_common', |
| 'cast_service', |
| 'cast_shell_pak', |
| + 'cast_shell_resources', |
| 'cast_version_header', |
| + 'chromecast_locales.gyp:chromecast_locales_pak', |
| + 'chromecast_locales.gyp:chromecast_settings', |
| '../ui/aura/aura.gyp:aura_test_support', |
| '../content/content.gyp:content', |
| '../content/content.gyp:content_app_browser', |
| @@ -134,6 +153,10 @@ |
| 'shell/browser/cast_content_browser_client.h', |
| 'shell/browser/cast_http_user_agent_settings.cc', |
| 'shell/browser/cast_http_user_agent_settings.h', |
| + 'shell/browser/devtools/cast_dev_tools_delegate.cc', |
| + 'shell/browser/devtools/cast_dev_tools_delegate.h', |
| + 'shell/browser/devtools/remote_debugging_server.cc', |
| + 'shell/browser/devtools/remote_debugging_server.h', |
| 'shell/browser/geolocation/cast_access_token_store.cc', |
| 'shell/browser/geolocation/cast_access_token_store.h', |
| 'shell/browser/url_request_context_factory.cc', |
| @@ -152,6 +175,9 @@ |
| 'dependencies': [ |
| '../ui/ozone/ozone.gyp:eglplatform_shim_x11', |
| ], |
| + 'sources': [ |
| + 'shell/browser/devtools/remote_debugging_server_simple.cc', |
| + ], |
| }], |
| ], |
| }, |