Chromium Code Reviews| Index: content/content.gyp |
| diff --git a/content/content.gyp b/content/content.gyp |
| index cbb21cdc6b43a10298822a68ffb0f99c998ef2e1..ce1c9ef2678ea319b0231d196af457ecd721775c 100644 |
| --- a/content/content.gyp |
| +++ b/content/content.gyp |
| @@ -21,11 +21,13 @@ |
| }], |
| ], |
| }, |
| + 'includes': [ |
| + 'content_common_mojo_bindings.gypi', |
| + ], |
| 'conditions': [ |
| ['OS != "ios"', { |
| 'includes': [ |
| '../build/win_precompile.gypi', |
| - 'content_common_mojo_bindings.gypi', |
| 'content_resources.gypi', |
| ], |
| }], |
| @@ -67,6 +69,7 @@ |
| 'dependencies': [ |
| 'content_browser', |
| 'content_common', |
| + 'content_common_mojo_bindings', |
| ], |
| 'export_dependent_settings': [ |
| 'content_common', |
| @@ -75,7 +78,6 @@ |
| ['OS != "ios"', { |
| 'dependencies': [ |
| 'content_child', |
| - 'content_common_mojo_bindings', |
| 'content_gpu', |
| 'content_plugin', |
| 'content_ppapi_plugin', |
| @@ -157,6 +159,7 @@ |
| ], |
| 'dependencies': [ |
| 'content_common', |
| + 'content_common_mojo_bindings', |
| ], |
| 'export_dependent_settings': [ |
| 'content_common', |
|
blundell
2014/12/03 15:43:45
You should export_dependent_settings on content_co
timvolodine
2014/12/03 19:23:34
Done.
|
| @@ -175,7 +178,6 @@ |
| }], |
| ['OS != "ios"', { |
| 'dependencies': [ |
| - 'content_common_mojo_bindings', |
| 'content_resources', |
| ], |
| }], |
| @@ -189,10 +191,12 @@ |
| 'includes': [ |
| 'content_common.gypi', |
| ], |
| + 'dependencies': [ |
| + 'content_common_mojo_bindings', |
| + ], |
| 'conditions': [ |
| ['OS != "ios"', { |
| 'dependencies': [ |
| - 'content_common_mojo_bindings', |
| 'content_resources', |
| ], |
| }], |
| @@ -304,6 +308,7 @@ |
| 'type': 'shared_library', |
| 'variables': { 'enable_wexit_time_destructors': 1, }, |
| 'dependencies': [ |
| + 'content_common_mojo_bindings', |
|
blundell
2014/12/03 15:43:46
and here.
timvolodine
2014/12/03 19:23:34
Done.
|
| 'content_resources', |
| ], |
| 'conditions': [ |
| @@ -312,11 +317,6 @@ |
| '../v8/src/third_party/vtune/v8vtune.gyp:v8_vtune', |
| ], |
| }], |
| - ['OS != "ios"', { |
| - 'dependencies': [ |
| - 'content_common_mojo_bindings', |
| - ] |
| - }] |
| ], |
| 'includes': [ |
| 'content_app.gypi', |