| 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 { |
| (...skipping 12 matching lines...) Expand all Loading... |
| 23 '../../components/components.gyp:history_core_browser', | 23 '../../components/components.gyp:history_core_browser', |
| 24 # infobars_test_support is required to declare some symbols used in the | 24 # infobars_test_support is required to declare some symbols used in the |
| 25 # search_engines and its dependencies. See crbug.com/386171 | 25 # search_engines and its dependencies. See crbug.com/386171 |
| 26 # TODO(mukai): declare those symbols for Athena. | 26 # TODO(mukai): declare those symbols for Athena. |
| 27 '../../components/components.gyp:infobars_test_support', | 27 '../../components/components.gyp:infobars_test_support', |
| 28 '../../components/components.gyp:search_engines', | 28 '../../components/components.gyp:search_engines', |
| 29 '../../extensions/shell/app_shell.gyp:app_shell_lib', | 29 '../../extensions/shell/app_shell.gyp:app_shell_lib', |
| 30 '../../skia/skia.gyp:skia', | 30 '../../skia/skia.gyp:skia', |
| 31 '../../ui/accessibility/accessibility.gyp:ax_gen', | 31 '../../ui/accessibility/accessibility.gyp:ax_gen', |
| 32 '../../ui/app_list/app_list.gyp:app_list', | 32 '../../ui/app_list/app_list.gyp:app_list', |
| 33 '../../ui/chromeos/ui_chromeos.gyp:ui_chromeos', |
| 33 '../../ui/keyboard/keyboard.gyp:keyboard', | 34 '../../ui/keyboard/keyboard.gyp:keyboard', |
| 34 '../../ui/views/views.gyp:views', | 35 '../../ui/views/views.gyp:views', |
| 35 '../../url/url.gyp:url_lib', | 36 '../../url/url.gyp:url_lib', |
| 36 ], | 37 ], |
| 37 'include_dirs': [ | 38 'include_dirs': [ |
| 38 '../..', | 39 '../..', |
| 39 ], | 40 ], |
| 40 'sources': [ | 41 'sources': [ |
| 41 'athena_app_window_controller.cc', | 42 'athena_app_window_controller.cc', |
| 42 'athena_app_window_controller.h', | 43 'athena_app_window_controller.h', |
| 43 'athena_launcher.cc', | 44 'athena_launcher.cc', |
| 44 'athena_launcher.h', | 45 'athena_launcher.h', |
| 45 'debug/debug_window.cc', | 46 'debug/debug_window.cc', |
| 46 'debug/debug_window.h', | 47 'debug/debug_window.h', |
| 48 'debug/network_selector.cc', |
| 49 'debug/network_selector.h', |
| 47 'url_search_provider.cc', | 50 'url_search_provider.cc', |
| 48 'url_search_provider.h', | 51 'url_search_provider.h', |
| 49 'athena_main.cc', | 52 'athena_main.cc', |
| 50 'placeholder.cc', | 53 'placeholder.cc', |
| 51 'placeholder.h', | 54 'placeholder.h', |
| 52 ], | 55 ], |
| 53 }, | 56 }, |
| 54 { | 57 { |
| 55 'target_name': 'athena_shell', | 58 'target_name': 'athena_shell', |
| 56 'type': 'executable', | 59 'type': 'executable', |
| 57 'dependencies': [ | 60 'dependencies': [ |
| 58 '../../base/base.gyp:base', | 61 '../../base/base.gyp:base', |
| 59 '../../base/base.gyp:base_i18n', | 62 '../../base/base.gyp:base_i18n', |
| 60 '../../skia/skia.gyp:skia', | 63 '../../skia/skia.gyp:skia', |
| 61 '../../ui/accessibility/accessibility.gyp:ax_gen', | 64 '../../ui/accessibility/accessibility.gyp:ax_gen', |
| 62 '../../ui/aura/aura.gyp:aura', | 65 '../../ui/aura/aura.gyp:aura', |
| 63 '../../ui/compositor/compositor.gyp:compositor_test_support', | 66 '../../ui/compositor/compositor.gyp:compositor_test_support', |
| 64 '../../ui/gfx/gfx.gyp:gfx', | 67 '../../ui/gfx/gfx.gyp:gfx', |
| 65 '../athena.gyp:athena_lib', | 68 '../athena.gyp:athena_lib', |
| 66 '../athena.gyp:athena_test_support', | 69 '../athena.gyp:athena_test_support', |
| 67 '../resources/athena_resources.gyp:athena_pak', | 70 '../resources/athena_resources.gyp:athena_pak', |
| 68 ], | 71 ], |
| 69 'sources': [ | 72 'sources': [ |
| 70 'athena_shell.cc', | 73 'athena_shell.cc', |
| 71 ], | 74 ], |
| 72 } | 75 } |
| 73 ], # targets | 76 ], # targets |
| 74 } | 77 } |
| OLD | NEW |