Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2759)

Unified Diff: athena/main/athena_main.gyp

Issue 485183002: introduced athena_main_lib (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: gyp cleanup Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « athena/main/athena_main.cc ('k') | athena/test/athena_test_helper.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
« no previous file with comments | « athena/main/athena_main.cc ('k') | athena/test/athena_test_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698