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_browser.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_browser.gypi')
| -rw-r--r-- | content/content_browser.gypi | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/content/content_browser.gypi b/content/content_browser.gypi index 34fca9c..e850c4b 100644 --- a/content/content_browser.gypi +++ b/content/content_browser.gypi @@ -1401,18 +1401,6 @@ 'browser/gamepad/gamepad_platform_data_fetcher.cc', ] }], - ['use_mojo==1', { - 'dependencies': [ - '../mojo/mojo.gyp:mojo_bindings', - '../mojo/mojo.gyp:mojo_system', - 'content_common_mojo_bindings', - ], - }, { # use_mojo==0 - 'sources!': [ - 'browser/renderer_host/render_process_host_mojo_impl.cc', - 'browser/renderer_host/render_process_host_mojo_impl.h', - ], - }], ['OS=="ios"', { 'sources/': [ # iOS only needs a small portion of content; exclude all the @@ -1442,7 +1430,10 @@ }, { # OS!="ios" 'dependencies': [ 'browser/devtools/devtools_resources.gyp:devtools_resources', + 'content_common_mojo_bindings', '../cc/cc.gyp:cc', + '../mojo/mojo.gyp:mojo_bindings', + '../mojo/mojo.gyp:mojo_system', '../net/net.gyp:http_server', '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase', '../ui/surface/surface.gyp:surface', |