Chromium Code Reviews| Index: apps/apps.gypi |
| diff --git a/apps/apps.gypi b/apps/apps.gypi |
| index 70331360728aba830fa8a164ccc794420e3b9b49..cd3693d284d4d67af35372b060b225a33c614015 100644 |
| --- a/apps/apps.gypi |
| +++ b/apps/apps.gypi |
| @@ -151,8 +151,8 @@ |
| ], |
| }, |
| { |
| - 'target_name': 'app_shell', |
| - 'type': 'executable', |
| + 'target_name': 'app_shell_lib', |
| + 'type': 'static_library', |
| 'defines!': ['CONTENT_IMPLEMENTATION'], |
| 'variables': { |
| 'chromium_code': 1, |
| @@ -175,7 +175,6 @@ |
| 'sources': [ |
| 'shell/app/shell_main_delegate.cc', |
| 'shell/app/shell_main_delegate.h', |
| - 'shell/app/shell_main.cc', |
| 'shell/browser/shell_app_sorting.cc', |
| 'shell/browser/shell_app_sorting.h', |
| 'shell/browser/shell_app_window_delegate.cc', |
| @@ -217,7 +216,54 @@ |
| }], |
| ], |
| }, |
| + { |
| + 'target_name': 'app_shell', |
| + 'type': 'executable', |
| + 'defines!': ['CONTENT_IMPLEMENTATION'], |
| + 'variables': { |
| + 'chromium_code': 1, |
| + }, |
| + 'dependencies': [ |
| + 'app_shell_lib', |
| + 'app_shell_pak', |
| + ], |
| + 'include_dirs': [ |
| + '..', |
| + ], |
| + 'sources': [ |
| + 'shell/app/shell_main.cc', |
| + ], |
| + }, |
| + { |
| + 'target_name': 'app_shell_browsertests', |
|
James Cook
2014/03/20 00:00:35
nit: I'm not sure how we name these. Should it be
Yoyo Zhou
2014/03/20 21:17:30
I couldn't decide between app_shell_tests and apps
jam
2014/03/20 23:43:22
+1, it's good to have a convention of using browse
|
| + 'type': '<(gtest_target_type)', |
| + 'variables': { |
| + 'chromium_code': 1, |
| + }, |
| + 'dependencies': [ |
| + 'app_shell_lib', |
| + # TODO(yoz): find the right deps |
| + '../base/base.gyp:test_support_base', |
| + '../content/content.gyp:content_app_both', |
| + '../content/content_shell_and_tests.gyp:content_browser_test_support', |
| + '../content/content_shell_and_tests.gyp:test_support_content', |
| + '../testing/gtest.gyp:gtest', |
| + ], |
| + 'defines': [ |
| + 'HAS_OUT_OF_PROC_TEST_RUNNER', |
| + ], |
| + 'sources': [ |
| + # TODO(yoz): Refactor once we have a second test target. |
| + 'test/app_shell_test.h', |
| + 'test/app_shell_test.cc', |
| + 'test/apps_test_launcher_delegate.cc', |
| + 'test/apps_test_launcher_delegate.h', |
| + 'test/apps_test_suite_base.h', |
| + 'test/apps_test_suite_base.cc', |
| + 'test/apps_tests_main.cc', |
| + ], |
| + }, |
| ], # targets |
| - }], # chromeos==1 |
| + }], # chromeos==1 or linux aura or win aura |
| ], # conditions |
| } |