Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(271)

Unified Diff: content/content_browser.gypi

Issue 226213002: Removes use_mojo (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge 2 trunk Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/content_app.gypi ('k') | content/content_common.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/content_browser.gypi
diff --git a/content/content_browser.gypi b/content/content_browser.gypi
index 34fca9c7cbb20a00a5109caab8b03c3c2d64c432..e850c4b8d1c9e03477cae6ea3771c6a85b456c75 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',
« no previous file with comments | « content/content_app.gypi ('k') | content/content_common.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698