summaryrefslogtreecommitdiffstats
path: root/mojo/mojo_services.gypi
diff options
context:
space:
mode:
authordavemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-06 05:13:42 +0000
committerdavemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-06 05:13:42 +0000
commite81804aaaddb1e1c1e8566789527739eb26c5f1c (patch)
treef0bbc7a5c545542a3cfdfb5caf8c17afa7ab22a7 /mojo/mojo_services.gypi
parent502857ff2aaa56352f05dfd7957db16dbf8e1b47 (diff)
downloadchromium_src-e81804aaaddb1e1c1e8566789527739eb26c5f1c.zip
chromium_src-e81804aaaddb1e1c1e8566789527739eb26c5f1c.tar.gz
chromium_src-e81804aaaddb1e1c1e8566789527739eb26c5f1c.tar.bz2
Make mojo_main_{chromium,standalone} a variable instead of a target
BUG= Review URL: https://codereview.chromium.org/316223002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@275335 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'mojo/mojo_services.gypi')
-rw-r--r--mojo/mojo_services.gypi3
1 files changed, 2 insertions, 1 deletions
diff --git a/mojo/mojo_services.gypi b/mojo/mojo_services.gypi
index b4b691b..af4c0a7 100644
--- a/mojo/mojo_services.gypi
+++ b/mojo/mojo_services.gypi
@@ -331,6 +331,7 @@
'../ui/base/ui_base.gyp:ui_base',
'../ui/gfx/gfx.gyp:gfx',
'../ui/gfx/gfx.gyp:gfx_geometry',
+ 'mojo_application',
'mojo_aura_support',
'mojo_common_lib',
'mojo_environment_chromium',
@@ -340,13 +341,13 @@
'mojo_input_events_bindings',
'mojo_input_events_lib',
'mojo_launcher_bindings',
- 'mojo_main_chromium',
'mojo_native_viewport_bindings',
'mojo_system_impl',
'mojo_view_manager_bindings',
'mojo_view_manager_common',
],
'sources': [
+ 'public/cpp/application/lib/mojo_main_chromium.cc',
'services/view_manager/ids.h',
'services/view_manager/main.cc',
'services/view_manager/node.cc',