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

Unified Diff: content/content_app.gypi

Issue 376573003: Pull necessary dependencies to be able to process mojo.gyp on iOS (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 6 years, 4 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/app/content_main_runner.cc ('k') | content/content_browser.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/content_app.gypi
diff --git a/content/content_app.gypi b/content/content_app.gypi
index 00ee842b1483168c88dc59d9cb033df06ef51c17..8ac04deda69a27ddb789b9669b931060f997bbf7 100644
--- a/content/content_app.gypi
+++ b/content/content_app.gypi
@@ -10,6 +10,10 @@
'../base/base.gyp:base',
'../base/base.gyp:base_i18n',
'../crypto/crypto.gyp:crypto',
+ '../mojo/mojo_base.gyp:mojo_application_bindings',
+ '../mojo/mojo_base.gyp:mojo_environment_chromium',
+ '../mojo/mojo_base.gyp:mojo_system_impl',
+ '../mojo/mojo.gyp:mojo_application_manager',
'../ui/base/ui_base.gyp:ui_base',
'../ui/gfx/gfx.gyp:gfx',
'../ui/gfx/gfx.gyp:gfx_geometry',
@@ -59,16 +63,7 @@
['OS=="ios"', {
'sources!': [
'app/content_main.cc',
- 'app/mojo/mojo_init.cc',
- 'app/mojo/mojo_init.h',
],
- }, { # OS!="ios"
- 'dependencies': [
- '../mojo/mojo_base.gyp:mojo_application_bindings',
- '../mojo/mojo_base.gyp:mojo_environment_chromium',
- '../mojo/mojo_base.gyp:mojo_system_impl',
- '../mojo/mojo.gyp:mojo_application_manager',
- ],
}],
],
}
« no previous file with comments | « content/app/content_main_runner.cc ('k') | content/content_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698