| Index: content/content.gyp
|
| diff --git a/content/content.gyp b/content/content.gyp
|
| index 4da6428265ba3dcfdf59cc9fce593d64d484bd5c..56b3b37d1ba2bb3fd1199a21ddd700c0a12dcc3f 100644
|
| --- a/content/content.gyp
|
| +++ b/content/content.gyp
|
| @@ -25,6 +25,7 @@
|
| ['OS != "ios"', {
|
| 'includes': [
|
| 'content_common_mojo_bindings.gypi',
|
| + 'content_resources.gypi',
|
| '../build/win_precompile.gypi',
|
| ],
|
| }],
|
| @@ -152,7 +153,6 @@
|
| ],
|
| 'dependencies': [
|
| 'content_common',
|
| - 'content_resources.gyp:content_resources',
|
| ],
|
| 'export_dependent_settings': [
|
| 'content_common',
|
| @@ -169,6 +169,11 @@
|
| 'content_utility',
|
| ],
|
| }],
|
| + ['OS != "ios"', {
|
| + 'dependencies': [
|
| + 'content_resources',
|
| + ],
|
| + }],
|
| ],
|
| },
|
| {
|
| @@ -182,7 +187,7 @@
|
| 'conditions': [
|
| ['OS != "ios"', {
|
| 'dependencies': [
|
| - 'content_resources.gyp:content_resources',
|
| + 'content_resources',
|
| ],
|
| }],
|
| ],
|
| @@ -202,7 +207,7 @@
|
| 'content_child.gypi',
|
| ],
|
| 'dependencies': [
|
| - 'content_resources.gyp:content_resources',
|
| + 'content_resources',
|
| ],
|
| # Disable c4267 warnings until we fix size_t to int truncations.
|
| 'msvs_disabled_warnings': [ 4267, ],
|
| @@ -255,7 +260,7 @@
|
| 'dependencies': [
|
| 'content_child',
|
| 'content_common',
|
| - 'content_resources.gyp:content_resources',
|
| + 'content_resources',
|
| ],
|
| 'conditions': [
|
| ['chromium_enable_vtune_jit_for_v8==1', {
|
| @@ -290,7 +295,7 @@
|
| 'type': 'shared_library',
|
| 'variables': { 'enable_wexit_time_destructors': 1, },
|
| 'dependencies': [
|
| - 'content_resources.gyp:content_resources',
|
| + 'content_resources',
|
| ],
|
| 'conditions': [
|
| ['chromium_enable_vtune_jit_for_v8==1', {
|
| @@ -350,7 +355,7 @@
|
| # GN version: //content/common and //content/public/common
|
| 'target_name': 'content_common',
|
| 'type': 'none',
|
| - 'dependencies': ['content', 'content_resources.gyp:content_resources'],
|
| + 'dependencies': ['content', 'content_resources'],
|
| # Disable c4267 warnings until we fix size_t to int truncations.
|
| 'msvs_disabled_warnings': [ 4267, ],
|
| 'export_dependent_settings': ['content'],
|
|
|