diff options
| -rw-r--r-- | content/content.gyp | 33 |
1 files changed, 14 insertions, 19 deletions
diff --git a/content/content.gyp b/content/content.gyp index c68fd3a..9c51df7 100644 --- a/content/content.gyp +++ b/content/content.gyp @@ -47,12 +47,12 @@ 'type': 'none', 'dependencies': [ 'content_browser', - 'content_child', 'content_common', ], 'conditions': [ ['OS != "ios"', { 'dependencies': [ + 'content_child', 'content_gpu', 'content_plugin', 'content_ppapi_plugin', @@ -152,29 +152,24 @@ # Disable c4267 warnings until we fix size_t to int truncations. 'msvs_disabled_warnings': [ 4267, ], }, - { - 'target_name': 'content_child', - 'type': 'static_library', - 'variables': { 'enable_wexit_time_destructors': 1, }, - 'includes': [ - 'content_child.gypi', - ], - 'conditions': [ - ['OS != "ios"', { - 'dependencies': [ - 'content_resources.gyp:content_resources', - ], - }], - ], - # Disable c4267 warnings until we fix size_t to int truncations. - 'msvs_disabled_warnings': [ 4267, ], - }, - ], 'conditions': [ ['OS != "ios"', { 'targets': [ { + 'target_name': 'content_child', + 'type': 'static_library', + 'variables': { 'enable_wexit_time_destructors': 1, }, + 'includes': [ + 'content_child.gypi', + ], + 'dependencies': [ + 'content_resources.gyp:content_resources', + ], + # Disable c4267 warnings until we fix size_t to int truncations. + 'msvs_disabled_warnings': [ 4267, ], + }, + { 'target_name': 'content_gpu', 'type': 'static_library', 'variables': { 'enable_wexit_time_destructors': 1, }, |