Chromium Code Reviews| Index: ash/ash.gyp |
| diff --git a/ash/ash.gyp b/ash/ash.gyp |
| index fa9e45202deecfc6a3ed1b5c344638534b49f239..8c97beb8bfcef35a060bc9f839f863f8b1b7921e 100644 |
| --- a/ash/ash.gyp |
| +++ b/ash/ash.gyp |
| @@ -353,7 +353,7 @@ |
| ], |
| }, |
| { |
| - 'target_name': 'aura_shell_unittests', |
| + 'target_name': 'ash_unittests', |
| 'type': 'executable', |
| 'dependencies': [ |
| '../base/base.gyp:base', |
| @@ -394,7 +394,7 @@ |
| 'launcher/launcher_context_menu_unittest.cc', |
| 'launcher/launcher_model_unittest.cc', |
| 'launcher/launcher_navigator_unittest.cc', |
| - 'launcher/launcher_tooltip_manager_unittest.cc', |
| + 'launcher/launcher_tooltip_manager_unittest.cc', |
|
Greg Spencer (Chromium)
2012/07/12 19:58:54
Looks like some tab characters snuck in here.
James Cook
2012/07/12 20:53:11
Done.
|
| 'launcher/launcher_unittest.cc', |
| 'launcher/launcher_view_unittest.cc', |
| 'root_window_controller_unittest.cc', |
| @@ -469,7 +469,7 @@ |
| 'sources/': [ |
| ['exclude', 'accelerators/accelerator_controller_unittest.cc'], |
| ['exclude', 'accelerators/accelerator_filter_unittest.cc'], |
| - ['exclude', 'accelerators/nested_dispatcher_controller_unittest.cc'], |
| + ['exclude', 'accelerators/nested_dispatcher_controller_unittest.cc'], |
|
Greg Spencer (Chromium)
2012/07/12 19:58:54
Same here (tabs).
James Cook
2012/07/12 20:53:11
Done.
|
| ['exclude', 'drag_drop/drag_drop_controller_unittest.cc'], |
| ['exclude', 'tooltips/tooltip_controller_unittest.cc'], |
| ], |
| @@ -483,6 +483,38 @@ |
| }], |
| ], |
| }, |
| + # ash_unittests was formerly named aura_shell_unittests. While the build |
| + # bots are being switched to use the new name we need to support both |
| + # executables. |
| + # TODO(jamescook): Remove this section when build bots are building and |
| + # running ash_unittests. |
| + { |
| + 'target_name': 'aura_shell_unittests', |
| + 'type': 'none', |
| + 'dependencies': [ |
| + 'ash_unittests', |
| + ], |
| + 'actions': [ |
| + { |
| + 'message': 'TEMPORARY: Copy ash_unittests to aura_shell_unittests', |
| + 'action_name': 'copy_ash_unittests', |
| + 'variables': { |
| + 'source_file': '<(PRODUCT_DIR)/ash_unittests<(EXECUTABLE_SUFFIX)', |
| + 'dest_file': '<(PRODUCT_DIR)/aura_shell_unittests<(EXECUTABLE_SUFFIX)', |
| + }, |
| + 'inputs': [ |
| + '<(DEPTH)/build/cp.py', |
| + '<(source_file)', |
| + ], |
| + 'outputs': [ |
| + '<(dest_file)', |
| + ], |
| + 'action': [ |
| + 'python', '<(DEPTH)/build/cp.py', '<(source_file)', '<(dest_file)', |
| + ], |
| + }, |
| + ], |
| + }, |
| { |
| 'target_name': 'ash_shell', |
| 'type': 'executable', |