diff options
| author | davemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-20 22:26:12 +0000 |
|---|---|---|
| committer | davemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-20 22:26:12 +0000 |
| commit | 053baf3bdcf52ee85a8d1fa795777df374bdbac8 (patch) | |
| tree | cf986b67404c9883d5ddba6adc7d0709dc537ff5 /content/content_app.gypi | |
| parent | 10f1b3a61e6a5cb41ea442c4922eb896622d35d9 (diff) | |
| download | chromium_src-053baf3bdcf52ee85a8d1fa795777df374bdbac8.zip chromium_src-053baf3bdcf52ee85a8d1fa795777df374bdbac8.tar.gz chromium_src-053baf3bdcf52ee85a8d1fa795777df374bdbac8.tar.bz2 | |
Add creation of ServiceManager to Content
BUG=None
TEST=Mojo.Init
R=jam@chromium.org, sky@chromium.org, jam
Review URL: https://codereview.chromium.org/187183002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@258438 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/content_app.gypi')
| -rw-r--r-- | content/content_app.gypi | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/content/content_app.gypi b/content/content_app.gypi index 4908175..6187bce 100644 --- a/content/content_app.gypi +++ b/content/content_app.gypi @@ -24,6 +24,8 @@ 'app/android/library_loader_hooks.cc', 'app/content_main.cc', 'app/content_main_runner.cc', + 'app/mojo/mojo_init.cc', + 'app/mojo/mojo_init.h', 'app/startup_helper_win.cc', 'public/app/android_library_loader_hooks.h', 'public/app/content_main.h', @@ -55,5 +57,18 @@ 'app/content_main.cc', ], }], + ['use_mojo==0', { + 'sources!': [ + 'app/mojo/mojo_init.cc', + 'app/mojo/mojo_init.h', + ], + }, { + 'dependencies': [ + '../mojo/mojo.gyp:mojo_environment_chromium', + '../mojo/mojo.gyp:mojo_service_manager', + '../mojo/mojo.gyp:mojo_system', + '../mojo/mojo.gyp:mojo_system_impl', + ], + }], ], } |