| Index: athena/main/athena_main.gyp
|
| diff --git a/athena/main/athena_main.gyp b/athena/main/athena_main.gyp
|
| index 1b818b1332dae590685c0f00a4af768977c42026..c4641a88493ddc162767f55bed4026fff587c83a 100644
|
| --- a/athena/main/athena_main.gyp
|
| +++ b/athena/main/athena_main.gyp
|
| @@ -8,12 +8,11 @@
|
| },
|
| 'targets': [
|
| {
|
| - 'target_name': 'athena_main',
|
| - 'type': 'executable',
|
| + 'target_name': 'athena_main_lib',
|
| + 'type': 'static_library',
|
| 'dependencies': [
|
| '../athena.gyp:athena_lib',
|
| '../athena.gyp:athena_content_lib',
|
| - '../resources/athena_resources.gyp:athena_pak',
|
| '../resources/athena_resources.gyp:athena_resources',
|
| # debug_widow.cc depends on this. Remove this once debug_window
|
| # is removed.
|
| @@ -29,7 +28,6 @@
|
| '../../components/components.gyp:search_engines',
|
| '../../extensions/shell/app_shell.gyp:app_shell_lib',
|
| '../../skia/skia.gyp:skia',
|
| - '../../ui/accessibility/accessibility.gyp:ax_gen',
|
| '../../ui/app_list/app_list.gyp:app_list',
|
| '../../ui/chromeos/ui_chromeos.gyp:ui_chromeos',
|
| '../../ui/keyboard/keyboard.gyp:keyboard',
|
| @@ -51,28 +49,23 @@
|
| 'debug/network_selector.h',
|
| 'url_search_provider.cc',
|
| 'url_search_provider.h',
|
| - 'athena_main.cc',
|
| 'placeholder.cc',
|
| 'placeholder.h',
|
| ],
|
| },
|
| {
|
| - 'target_name': 'athena_shell',
|
| + 'target_name': 'athena_main',
|
| 'type': 'executable',
|
| 'dependencies': [
|
| - '../../base/base.gyp:base',
|
| - '../../base/base.gyp:base_i18n',
|
| - '../../skia/skia.gyp:skia',
|
| '../../ui/accessibility/accessibility.gyp:ax_gen',
|
| - '../../ui/aura/aura.gyp:aura',
|
| - '../../ui/compositor/compositor.gyp:compositor_test_support',
|
| - '../../ui/gfx/gfx.gyp:gfx',
|
| - '../athena.gyp:athena_lib',
|
| - '../athena.gyp:athena_test_support',
|
| '../resources/athena_resources.gyp:athena_pak',
|
| + 'athena_main_lib',
|
| + ],
|
| + 'include_dirs': [
|
| + '../..',
|
| ],
|
| 'sources': [
|
| - 'athena_shell.cc',
|
| + 'athena_main.cc',
|
| ],
|
| }
|
| ], # targets
|
|
|