introduced athena_main_lib

athena/main/athena_main.gyp

Index: athena/main/athena_main.gyp
diff --git a/athena/main/athena_main.gyp b/athena/main/athena_main.gyp
index 1b818b1332dae590685c0f00a4af768977c42026..fdc841d795cfe39e6e0ee318301f6e8229c1203b 100644
--- a/athena/main/athena_main.gyp
+++ b/athena/main/athena_main.gyp
@@ -8,19 +8,19 @@
   },
   '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.
         '../../ash/ash_resources.gyp:ash_resources',
         '../../chromeos/chromeos.gyp:power_manager_proto',
-        '../../components/components.gyp:component_metrics_proto',
         '../../components/components.gyp:history_core_browser',
+        '../../components/components.gyp:component_metrics_proto',
+#        '../../components/components.gyp:history_core_common',
         # infobars_test_support is required to declare some symbols used in the
         # search_engines and its dependencies. See crbug.com/386171
         # TODO(mukai): declare those symbols for Athena.
@@ -29,10 +29,8 @@
         '../../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',
         '../../ui/native_theme/native_theme.gyp:native_theme',
         '../../ui/views/views.gyp:views',
         '../../url/url.gyp:url_lib',
@@ -51,28 +49,31 @@
         'debug/network_selector.h',
         'url_search_provider.cc',
         'url_search_provider.h',
-        'athena_main.cc',
         'placeholder.cc',
         'placeholder.h',
       ],
     },
     {
-      'target_name': 'athena_shell',

[Jun Mukai, 2014/08/19 17:22:35]

just to confirm; do you intentionally remove athena_shell and silently add
dependency to content from athena_unittests right?
It would be great to send a PSA to the team when submitting this CL.

[oshima, 2014/08/19 18:05:49]

We discussed this in the meeting. I'll send out PSA.
content dependency isn't new. see athena_test_support.

I actually forgot to do gyp cleanup. I removed unnecessary deps.
PTAL.

+      'target_name': 'athena_main',
       'type': 'executable',
       'dependencies': [
         '../../base/base.gyp:base',
-        '../../base/base.gyp:base_i18n',
-        '../../skia/skia.gyp:skia',
+        '../../components/components.gyp:policy_component',
+        '../../extensions/shell/app_shell.gyp:app_shell_lib',
         '../../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',
+        '../../ui/keyboard/keyboard.gyp:keyboard',
+        '../../ui/native_theme/native_theme.gyp:native_theme',
+        '../athena.gyp:athena_content_lib',
         '../resources/athena_resources.gyp:athena_pak',
+        'athena_main_lib',
+      ],
+      'include_dirs': [
+        '../..',
       ],
       'sources': [
-        'athena_shell.cc',
+        'athena_main.cc',
       ],
     }
   ],  # targets