| Index: ash/ash.gyp
|
| diff --git a/ash/ash.gyp b/ash/ash.gyp
|
| index 08cf90b1531ed6e66c54833a0eec7f305236534d..cbc94a82ce29eea9944c53d2bb3fb3498b564f91 100644
|
| --- a/ash/ash.gyp
|
| +++ b/ash/ash.gyp
|
| @@ -435,6 +435,37 @@
|
| ],
|
| },
|
| {
|
| + 'target_name': 'test_support_ash',
|
| + 'type': 'static_library',
|
| + 'dependencies': [
|
| + '../skia/skia.gyp:skia',
|
| + '../testing/gtest.gyp:gtest',
|
| + 'ash',
|
| + 'ash_resources',
|
| + ],
|
| + 'sources': [
|
| + 'test/ash_test_base.cc',
|
| + 'test/ash_test_base.h',
|
| + 'test/ash_unittests.cc',
|
| + 'test/capture_tracking_view.cc',
|
| + 'test/capture_tracking_view.h',
|
| + 'test/cursor_manager_test_api.cc',
|
| + 'test/cursor_manager_test_api.h',
|
| + 'test/launcher_view_test_api.cc',
|
| + 'test/launcher_view_test_api.h',
|
| + 'test/test_activation_delegate.cc',
|
| + 'test/test_activation_delegate.h',
|
| + 'test/test_launcher_delegate.cc',
|
| + 'test/test_launcher_delegate.h',
|
| + 'test/test_shell_delegate.cc',
|
| + 'test/test_shell_delegate.h',
|
| + 'test/test_suite.cc',
|
| + 'test/test_suite.h',
|
| + 'test/test_suite_init.h',
|
| + 'test/test_suite_init.mm',
|
| + ],
|
| + },
|
| + {
|
| 'target_name': 'ash_unittests',
|
| 'type': 'executable',
|
| 'dependencies': [
|
| @@ -461,6 +492,7 @@
|
| '../ui/views/views.gyp:test_support_views',
|
| 'ash',
|
| 'ash_resources',
|
| + 'test_support_ash',
|
| ],
|
| 'sources': [
|
| '../ui/views/test/test_views_delegate.cc',
|
| @@ -501,25 +533,6 @@
|
| 'shell/window_watcher_unittest.cc',
|
| 'system/tray/system_tray_unittest.cc',
|
| 'system/web_notification/web_notification_tray_unittest.cc',
|
| - 'test/ash_test_base.cc',
|
| - 'test/ash_test_base.h',
|
| - 'test/ash_unittests.cc',
|
| - 'test/capture_tracking_view.cc',
|
| - 'test/capture_tracking_view.h',
|
| - 'test/cursor_manager_test_api.cc',
|
| - 'test/cursor_manager_test_api.h',
|
| - 'test/launcher_view_test_api.cc',
|
| - 'test/launcher_view_test_api.h',
|
| - 'test/test_activation_delegate.cc',
|
| - 'test/test_activation_delegate.h',
|
| - 'test/test_launcher_delegate.cc',
|
| - 'test/test_launcher_delegate.h',
|
| - 'test/test_shell_delegate.cc',
|
| - 'test/test_shell_delegate.h',
|
| - 'test/test_suite.cc',
|
| - 'test/test_suite.h',
|
| - 'test/test_suite_init.h',
|
| - 'test/test_suite_init.mm',
|
| 'tooltips/tooltip_controller_unittest.cc',
|
| 'wm/activation_controller_unittest.cc',
|
| 'wm/base_layout_manager_unittest.cc',
|
|
|