diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-05 20:14:17 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-05 20:14:17 +0000 |
| commit | 1c142a5d402b0a0a33ca345dbc65af719ff7f294 (patch) | |
| tree | 83c68ddffcb391bf1acb218aac1cd19d91df7cf8 /content/content_common.gypi | |
| parent | f6c30c92b7d0d3202bced1f0b991dc0e72a3ff66 (diff) | |
| download | chromium_src-1c142a5d402b0a0a33ca345dbc65af719ff7f294.zip chromium_src-1c142a5d402b0a0a33ca345dbc65af719ff7f294.tar.gz chromium_src-1c142a5d402b0a0a33ca345dbc65af719ff7f294.tar.bz2 | |
Removes use_mojo
Now that we've sorted out the build issues on all platforms it can be
removed.
BUG=353602
TEST=none
R=jam@chromium.org
TBR=tsepez@chromium.org
Review URL: https://codereview.chromium.org/226213002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@262032 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/content_common.gypi')
| -rw-r--r-- | content/content_common.gypi | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/content/content_common.gypi b/content/content_common.gypi index 5f51794..01b5f42 100644 --- a/content/content_common.gypi +++ b/content/content_common.gypi @@ -500,6 +500,9 @@ '../ipc/ipc.gyp:ipc', '../media/media.gyp:media', '../media/media.gyp:shared_memory_support', + '../mojo/mojo.gyp:mojo_environment_chromium', + '../mojo/mojo.gyp:mojo_system', + '../mojo/mojo.gyp:mojo_system_impl', '../third_party/WebKit/public/blink.gyp:blink', '../ui/gl/gl.gyp:gl', '../webkit/common/gpu/webkit_gpu.gyp:webkit_gpu', @@ -509,18 +512,6 @@ 'content.gyp:webkit_version', ], }], - ['use_mojo==0', { - 'sources!': [ - 'common/mojo/mojo_channel_init.cc', - 'common/mojo/mojo_channel_init.h', - ], - }, { - 'dependencies': [ - '../mojo/mojo.gyp:mojo_environment_chromium', - '../mojo/mojo.gyp:mojo_system', - '../mojo/mojo.gyp:mojo_system_impl', - ], - }], ['OS=="mac"', { 'dependencies': [ '../webkit/webkit_resources.gyp:webkit_resources', |