Chromium Code Reviews| Index: content/content.gyp |
| diff --git a/content/content.gyp b/content/content.gyp |
| index cbb21cdc6b43a10298822a68ffb0f99c998ef2e1..19468b651a54ec6f934f8a8a087d56517dd5aa22 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', |
| ], |
| }], |
| @@ -75,7 +77,6 @@ |
| ['OS != "ios"', { |
| 'dependencies': [ |
| 'content_child', |
| - 'content_common_mojo_bindings', |
| 'content_gpu', |
| 'content_plugin', |
| 'content_ppapi_plugin', |
| @@ -175,7 +176,6 @@ |
| }], |
| ['OS != "ios"', { |
| 'dependencies': [ |
| - 'content_common_mojo_bindings', |
| 'content_resources', |
| ], |
| }], |
| @@ -189,10 +189,15 @@ |
| 'includes': [ |
| 'content_common.gypi', |
| ], |
| + 'dependencies': [ |
| + 'content_common_mojo_bindings', |
| + ], |
| + 'export_dependent_settings': [ |
| + 'content_common_mojo_bindings', |
|
blundell
2014/12/04 12:21:44
This isn't technically correct, since no code unde
timvolodine
2014/12/04 12:58:01
my rationale was that:
permission_service.mojom an
|
| + ], |
| 'conditions': [ |
| ['OS != "ios"', { |
| 'dependencies': [ |
| - 'content_common_mojo_bindings', |
| 'content_resources', |
| ], |
| }], |
| @@ -304,6 +309,7 @@ |
| 'type': 'shared_library', |
| 'variables': { 'enable_wexit_time_destructors': 1, }, |
| 'dependencies': [ |
| + 'content_common_mojo_bindings', |
| 'content_resources', |
| ], |
| 'conditions': [ |
| @@ -312,11 +318,6 @@ |
| '../v8/src/third_party/vtune/v8vtune.gyp:v8_vtune', |
| ], |
| }], |
| - ['OS != "ios"', { |
| - 'dependencies': [ |
| - 'content_common_mojo_bindings', |
| - ] |
| - }] |
| ], |
| 'includes': [ |
| 'content_app.gypi', |