diff options
| author | vandebo@chromium.org <vandebo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-21 17:51:28 +0000 |
|---|---|---|
| committer | vandebo@chromium.org <vandebo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-21 17:51:28 +0000 |
| commit | cfda411cede2280af945712a502e5fdd09e6b6d0 (patch) | |
| tree | 7de72ee2d32366ed926bfb84516e1d8363a3f46e /content/content_app.gypi | |
| parent | dd5e392a53c7aa927a9e6cd4ad6a46241b25cbaa (diff) | |
| download | chromium_src-cfda411cede2280af945712a502e5fdd09e6b6d0.zip chromium_src-cfda411cede2280af945712a502e5fdd09e6b6d0.tar.gz chromium_src-cfda411cede2280af945712a502e5fdd09e6b6d0.tar.bz2 | |
Revert of Add creation of ServiceManager to Content (https://codereview.chromium.org/187183002/)
Reason for revert:
Tests fail on Mac
Original issue's description:
> Add creation of ServiceManager to Content
>
> BUG=None
> TEST=Mojo.Init
> R=jam@chromium.org, sky@chromium.org, jam
>
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=258438
>
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=258607
TBR=jam@chromium.org,sky@chromium.org,davemoore@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=None
Review URL: https://codereview.chromium.org/208223006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@258624 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/content_app.gypi')
| -rw-r--r-- | content/content_app.gypi | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/content/content_app.gypi b/content/content_app.gypi index 6187bce..4908175 100644 --- a/content/content_app.gypi +++ b/content/content_app.gypi @@ -24,8 +24,6 @@ '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', @@ -57,18 +55,5 @@ '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', - ], - }], ], } |