Chromium Code Reviews| Index: chromecast/chromecast.gyp |
| diff --git a/chromecast/chromecast.gyp b/chromecast/chromecast.gyp |
| index 55561dfb510cd645918aab46a6dcafb94fed55b5..566b19e0add36966d4d455050b0e222a501b7ab5 100644 |
| --- a/chromecast/chromecast.gyp |
| +++ b/chromecast/chromecast.gyp |
| @@ -168,8 +168,8 @@ |
| ], |
| }, |
| { |
| - 'target_name': 'cast_shell', |
| - 'type': 'executable', |
| + 'target_name': 'cast_shell_core', |
| + 'type': '<(component)', |
| 'dependencies': [ |
| 'cast_common', |
| 'cast_metrics', |
| @@ -191,7 +191,6 @@ |
| 'net/network_change_notifier_cast.h', |
| 'net/network_change_notifier_factory_cast.cc', |
| 'net/network_change_notifier_factory_cast.h', |
| - 'shell/app/cast_main.cc', |
| 'shell/app/cast_main_delegate.cc', |
| 'shell/app/cast_main_delegate.h', |
| 'shell/browser/cast_browser_context.cc', |
| @@ -236,6 +235,49 @@ |
| ], |
| }, |
| { |
| + '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', |
| + ], |
| + 'defines': [ |
| + 'HAS_OUT_OF_PROC_TEST_RUNNER', |
| + ], |
| + 'sources': [ |
| + 'shell/browser/test/chromecast_shell_browser_test.cc', |
| + ], |
| + 'include_dirs': [ |
|
Paweł Hajdan Jr.
2014/09/09 12:24:31
Shouldn't this rather depend (directly or indirect
gunsch
2014/09/09 16:02:11
It does: dependency on cast_shell_test_support -->
|
| + '../testing/gtest/include', |
| + ], |
| + }, |
| + { |
| + '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', |
| + ], |
| + }, |
| + { |
| 'target_name': 'cast_version_header', |
| 'type': 'none', |
| 'direct_dependent_settings': { |