Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 { | 5 { |
| 6 'variables': { | 6 'variables': { |
| 7 'chromium_code': 1, | 7 'chromium_code': 1, |
| 8 }, | 8 }, |
| 9 'targets': [ | 9 'targets': [ |
| 10 { | 10 { |
| 11 'target_name': 'athena_lib', | 11 'target_name': 'athena_lib', |
| 12 'type': '<(component)', | 12 'type': '<(component)', |
| 13 'dependencies': [ | 13 'dependencies': [ |
| 14 '../base/base.gyp:test_support_base', | |
| 14 '../extensions/shell/app_shell.gyp:app_shell_version_header', | 15 '../extensions/shell/app_shell.gyp:app_shell_version_header', |
| 16 '../ipc/ipc.gyp:ipc', | |
| 15 '../skia/skia.gyp:skia', | 17 '../skia/skia.gyp:skia', |
| 16 '../ui/accessibility/accessibility.gyp:ax_gen', | 18 '../ui/accessibility/accessibility.gyp:ax_gen', |
| 17 '../ui/app_list/app_list.gyp:app_list', | 19 '../ui/app_list/app_list.gyp:app_list', |
| 18 '../ui/aura/aura.gyp:aura', | 20 '../ui/aura/aura.gyp:aura', |
| 21 '../ui/aura/aura.gyp:aura_test_support', | |
| 19 '../ui/events/events.gyp:events_base', | 22 '../ui/events/events.gyp:events_base', |
| 20 '../ui/strings/ui_strings.gyp:ui_strings', | 23 '../ui/strings/ui_strings.gyp:ui_strings', |
| 21 '../ui/views/views.gyp:views', | 24 '../ui/views/views.gyp:views', |
| 22 'resources/athena_resources.gyp:athena_resources', | 25 'resources/athena_resources.gyp:athena_resources', |
| 23 ], | 26 ], |
| 24 'defines': [ | 27 'defines': [ |
| 25 'ATHENA_IMPLEMENTATION', | 28 'ATHENA_IMPLEMENTATION', |
| 26 ], | 29 ], |
| 27 'sources': [ | 30 'sources': [ |
| 28 # All .cc, .h under athena, except unittests | 31 # All .cc, .h under athena, except unittests |
| (...skipping 29 matching lines...) Expand all Loading... | |
| 58 'input/accelerator_manager_impl.h', | 61 'input/accelerator_manager_impl.h', |
| 59 'input/input_manager_impl.cc', | 62 'input/input_manager_impl.cc', |
| 60 'input/public/accelerator_manager.h', | 63 'input/public/accelerator_manager.h', |
| 61 'input/public/input_manager.h', | 64 'input/public/input_manager.h', |
| 62 'screen/background_controller.cc', | 65 'screen/background_controller.cc', |
| 63 'screen/background_controller.h', | 66 'screen/background_controller.h', |
| 64 'screen/public/screen_manager.h', | 67 'screen/public/screen_manager.h', |
| 65 'screen/screen_accelerator_handler.cc', | 68 'screen/screen_accelerator_handler.cc', |
| 66 'screen/screen_accelerator_handler.h', | 69 'screen/screen_accelerator_handler.h', |
| 67 'screen/screen_manager_impl.cc', | 70 'screen/screen_manager_impl.cc', |
| 71 'system/device_socket_listener.cc', | |
| 72 'system/device_socket_listener.h', | |
| 73 'system/orientation_controller.cc', | |
| 74 'system/orientation_controller.h', | |
| 68 'system/power_button_controller.cc', | 75 'system/power_button_controller.cc', |
| 69 'system/power_button_controller.h', | 76 'system/power_button_controller.h', |
| 70 'system/public/system_ui.h', | 77 'system/public/system_ui.h', |
| 71 'system/system_ui_impl.cc', | 78 'system/system_ui_impl.cc', |
| 72 'wm/bezel_controller.cc', | 79 'wm/bezel_controller.cc', |
| 73 'wm/bezel_controller.h', | 80 'wm/bezel_controller.h', |
| 74 'wm/mru_window_tracker.cc', | 81 'wm/mru_window_tracker.cc', |
| 75 'wm/mru_window_tracker.h', | 82 'wm/mru_window_tracker.h', |
| 76 'wm/overview_toolbar.cc', | 83 'wm/overview_toolbar.cc', |
| 77 'wm/overview_toolbar.h', | 84 'wm/overview_toolbar.h', |
| (...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 132 '../skia/skia.gyp:skia', | 139 '../skia/skia.gyp:skia', |
| 133 '../testing/gtest.gyp:gtest', | 140 '../testing/gtest.gyp:gtest', |
| 134 '../ui/accessibility/accessibility.gyp:ax_gen', | 141 '../ui/accessibility/accessibility.gyp:ax_gen', |
| 135 '../ui/app_list/app_list.gyp:app_list', | 142 '../ui/app_list/app_list.gyp:app_list', |
| 136 '../ui/aura/aura.gyp:aura_test_support', | 143 '../ui/aura/aura.gyp:aura_test_support', |
| 137 '../ui/base/ui_base.gyp:ui_base_test_support', | 144 '../ui/base/ui_base.gyp:ui_base_test_support', |
| 138 '../ui/compositor/compositor.gyp:compositor_test_support', | 145 '../ui/compositor/compositor.gyp:compositor_test_support', |
| 139 '../ui/views/views.gyp:views', | 146 '../ui/views/views.gyp:views', |
| 140 '../ui/wm/wm.gyp:wm', | 147 '../ui/wm/wm.gyp:wm', |
| 141 '../url/url.gyp:url_lib', | 148 '../url/url.gyp:url_lib', |
| 149 'athena_content_lib', | |
|
oshima
2014/08/15 13:53:29
can you add comment that this is due to header dep
flackr
2014/08/15 13:55:54
This is due to athena_launcher.cc getting a TaskRu
| |
| 142 'athena_lib', | 150 'athena_lib', |
| 143 'resources/athena_resources.gyp:athena_resources', | 151 'resources/athena_resources.gyp:athena_resources', |
| 144 ], | 152 ], |
| 145 'sources': [ | 153 'sources': [ |
| 146 'main/athena_launcher.cc', | 154 'main/athena_launcher.cc', |
| 147 'main/athena_launcher.h', | 155 'main/athena_launcher.h', |
| 148 'main/placeholder.cc', | 156 'main/placeholder.cc', |
| 149 'main/placeholder.h', | 157 'main/placeholder.h', |
| 150 'test/athena_test_base.cc', | 158 'test/athena_test_base.cc', |
| 151 'test/athena_test_base.h', | 159 'test/athena_test_base.h', |
| (...skipping 22 matching lines...) Expand all Loading... | |
| 174 'activity/activity_manager_unittest.cc', | 182 'activity/activity_manager_unittest.cc', |
| 175 'home/home_card_unittest.cc', | 183 'home/home_card_unittest.cc', |
| 176 'input/accelerator_manager_unittest.cc', | 184 'input/accelerator_manager_unittest.cc', |
| 177 'screen/screen_manager_unittest.cc', | 185 'screen/screen_manager_unittest.cc', |
| 178 'wm/window_manager_unittest.cc', | 186 'wm/window_manager_unittest.cc', |
| 179 ], | 187 ], |
| 180 } | 188 } |
| 181 ], | 189 ], |
| 182 } | 190 } |
| 183 | 191 |
| OLD | NEW |