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

Unified Diff: content/content.gyp

Issue 728133002: Update mojo sdk to rev e01f9a49449381a5eb430c1fd88bf2cae73ec35a (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: android + ios gyp fixes Created 6 years, 1 month 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/browser/webui/web_ui_mojo_browsertest.cc ('k') | content/content_app.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/content.gyp
diff --git a/content/content.gyp b/content/content.gyp
index 5a7355f7ff3fd67933bb1ac3e388368c31b0430a..12cc4222e3d713db98ab31bca9412933579271fb 100644
--- a/content/content.gyp
+++ b/content/content.gyp
@@ -24,9 +24,9 @@
'conditions': [
['OS != "ios"', {
'includes': [
+ '../build/win_precompile.gypi',
'content_common_mojo_bindings.gypi',
'content_resources.gypi',
- '../build/win_precompile.gypi',
],
}],
['OS == "win"', {
@@ -75,6 +75,7 @@
['OS != "ios"', {
'dependencies': [
'content_child',
+ 'content_common_mojo_bindings',
'content_gpu',
'content_plugin',
'content_ppapi_plugin',
@@ -174,6 +175,7 @@
}],
['OS != "ios"', {
'dependencies': [
+ 'content_common_mojo_bindings',
'content_resources',
],
}],
@@ -190,6 +192,7 @@
'conditions': [
['OS != "ios"', {
'dependencies': [
+ 'content_common_mojo_bindings',
'content_resources',
],
}],
@@ -306,6 +309,11 @@
'../v8/src/third_party/vtune/v8vtune.gyp:v8_vtune',
],
}],
+ ['OS != "ios"', {
+ 'dependencies': [
+ 'content_common_mojo_bindings',
+ ]
+ }]
],
'includes': [
'content_app.gypi',
@@ -427,6 +435,7 @@
'../device/battery/battery.gyp:device_battery_java',
'../media/media.gyp:media_java',
'../mojo/mojo_base.gyp:mojo_system_java',
+ '../mojo/public/mojo_public.gyp:mojo_application_bindings',
'../mojo/public/mojo_public.gyp:mojo_bindings_java',
'../net/net.gyp:net',
'../ui/android/ui_android.gyp:ui_java',
« no previous file with comments | « content/browser/webui/web_ui_mojo_browsertest.cc ('k') | content/content_app.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698