| Index: content/content.gyp
|
| diff --git a/content/content.gyp b/content/content.gyp
|
| index 7bbbb7bb480efdbcfe885e0bcaa27f733518a656..fda8d1029ef285c480ac2861a0d41a3e2ece5078 100644
|
| --- a/content/content.gyp
|
| +++ b/content/content.gyp
|
| @@ -47,7 +47,7 @@
|
| 'dependencies': [
|
| 'content_app',
|
| 'content_browser',
|
| - 'content_common_plugin',
|
| + 'content_common_child',
|
| 'content_common',
|
| ],
|
| 'conditions': [
|
| @@ -99,7 +99,7 @@
|
| }],
|
| ['java_bridge==1', {
|
| 'dependencies': [
|
| - 'content_common_plugin',
|
| + 'content_common_child',
|
| ]
|
| }]
|
| ],
|
| @@ -122,11 +122,11 @@
|
| 'msvs_disabled_warnings': [ 4267, ],
|
| },
|
| {
|
| - 'target_name': 'content_common_plugin',
|
| + 'target_name': 'content_common_child',
|
| 'type': 'static_library',
|
| 'variables': { 'enable_wexit_time_destructors': 1, },
|
| 'includes': [
|
| - 'content_common_plugin.gypi',
|
| + 'content_common_child.gypi',
|
| ],
|
| 'conditions': [
|
| ['OS != "ios"', {
|
| @@ -162,7 +162,7 @@
|
| 'content_plugin.gypi',
|
| ],
|
| 'dependencies': [
|
| - 'content_common_plugin',
|
| + 'content_common_child',
|
| 'content_common',
|
| ],
|
| },
|
| @@ -184,7 +184,7 @@
|
| 'content_renderer.gypi',
|
| ],
|
| 'dependencies': [
|
| - 'content_common_plugin',
|
| + 'content_common_child',
|
| 'content_common',
|
| 'content_resources.gyp:content_resources',
|
| ],
|
| @@ -208,6 +208,7 @@
|
| 'content_worker.gypi',
|
| ],
|
| 'dependencies': [
|
| + 'content_common_child',
|
| 'content_common',
|
| ],
|
| },
|
| @@ -234,7 +235,7 @@
|
| 'includes': [
|
| 'content_app.gypi',
|
| 'content_browser.gypi',
|
| - 'content_common_plugin.gypi',
|
| + 'content_common_child.gypi',
|
| 'content_common.gypi',
|
| 'content_gpu.gypi',
|
| 'content_plugin.gypi',
|
| @@ -271,7 +272,7 @@
|
| 'msvs_disabled_warnings': [ 4267, ],
|
| },
|
| {
|
| - 'target_name': 'content_common_plugin',
|
| + 'target_name': 'content_common_child',
|
| 'type': 'none',
|
| 'dependencies': ['content'],
|
| },
|
|
|