| Index: chromecast/chromecast.gyp
|
| diff --git a/chromecast/chromecast.gyp b/chromecast/chromecast.gyp
|
| index ee3520358bf34020819397cd9dadf0f1a0079374..644273e5dc45028bc7d7af8ea76f1e897d33ff6b 100644
|
| --- a/chromecast/chromecast.gyp
|
| +++ b/chromecast/chromecast.gyp
|
| @@ -394,19 +394,18 @@
|
| ], # end of targets
|
| }, { # OS != "android"
|
| 'targets': [
|
| - # This target includes all dependencies that cannot be built on Android.
|
| + # This target contains all of the primary code of |cast_shell|, except
|
| + # for |main|. This allows end-to-end tests using |cast_shell|.
|
| + # This also includes all targets that cannot be built on Android.
|
| {
|
| - 'target_name': 'cast_shell',
|
| - 'type': 'executable',
|
| + 'target_name': 'cast_shell_core',
|
| + 'type': '<(component)',
|
| 'dependencies': [
|
| 'cast_net',
|
| 'cast_shell_common',
|
| 'media/media.gyp:cast_media',
|
| '../ui/aura/aura.gyp:aura_test_support',
|
| ],
|
| - 'sources': [
|
| - 'shell/app/cast_main.cc',
|
| - ],
|
| 'conditions': [
|
| ['chromecast_branding=="Chrome"', {
|
| 'dependencies': [
|
| @@ -419,6 +418,47 @@
|
| }],
|
| ],
|
| },
|
| + {
|
| + 'target_name': 'cast_shell',
|
| + 'type': 'executable',
|
| + 'dependencies': [
|
| + 'cast_shell_core',
|
| + ],
|
| + 'sources': [
|
| + 'shell/app/cast_main.cc',
|
| + ],
|
| + },
|
| + {
|
| + 'target_name': 'cast_shell_browser_test',
|
| + 'type': '<(gtest_target_type)',
|
| + 'dependencies': [
|
| + 'cast_shell_test_support',
|
| + '../testing/gtest.gyp:gtest',
|
| + ],
|
| + 'defines': [
|
| + 'HAS_OUT_OF_PROC_TEST_RUNNER',
|
| + ],
|
| + 'sources': [
|
| + 'shell/browser/test/chromecast_shell_browser_test.cc',
|
| + ],
|
| + },
|
| + {
|
| + 'target_name': 'cast_shell_test_support',
|
| + 'type': '<(component)',
|
| + 'defines': [
|
| + 'HAS_OUT_OF_PROC_TEST_RUNNER',
|
| + ],
|
| + 'dependencies': [
|
| + 'cast_shell_core',
|
| + '../content/content_shell_and_tests.gyp:content_browser_test_support',
|
| + '../testing/gtest.gyp:gtest',
|
| + ],
|
| + 'sources': [
|
| + 'shell/browser/test/chromecast_browser_test.cc',
|
| + 'shell/browser/test/chromecast_browser_test.h',
|
| + 'shell/browser/test/chromecast_browser_test_runner.cc',
|
| + ],
|
| + },
|
| ], # end of targets
|
| }],
|
| ], # end of conditions
|
|
|