Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1390)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/content.gyp

Issue 1710043002: Start to unwind references to iOS in //content (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Android fix Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/BUILD.gn ('k') | content/content_browser.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/content.gyp
diff --git a/content/content.gyp b/content/content.gyp
index 6b11ac2fd58512e405931a1b6156d4dcd2ddcc83..232814f69f63304ed9372438ad6d8f32cefe7d04 100644
--- a/content/content.gyp
+++ b/content/content.gyp
@@ -46,13 +46,11 @@
],
},
],
+ 'includes': [
+ '../build/win_precompile.gypi',
+ 'content_resources.gypi',
+ ],
'conditions': [
- ['OS != "ios"', {
- 'includes': [
- '../build/win_precompile.gypi',
- 'content_resources.gypi',
- ],
- }],
['OS == "win"', {
'targets': [
{
@@ -89,23 +87,17 @@
'type': 'none',
'dependencies': [
'content_browser',
+ 'content_child',
'content_common',
+ 'content_gpu',
+ 'content_plugin',
+ 'content_ppapi_plugin',
+ 'content_renderer',
+ 'content_utility',
],
'export_dependent_settings': [
'content_common',
],
- 'conditions': [
- ['OS != "ios"', {
- 'dependencies': [
- 'content_child',
- 'content_gpu',
- 'content_plugin',
- 'content_ppapi_plugin',
- 'content_renderer',
- 'content_utility',
- ],
- }],
- ],
},
{
# GN version: //content/app:browser
@@ -179,6 +171,7 @@
],
'dependencies': [
'content_common',
+ 'content_resources',
],
'export_dependent_settings': [
'content_common',
@@ -195,11 +188,6 @@
'content_utility',
],
}],
- ['OS != "ios"', {
- 'dependencies': [
- 'content_resources',
- ],
- }],
],
},
{
@@ -207,116 +195,106 @@
'target_name': 'content_common',
'type': 'static_library',
'variables': { 'enable_wexit_time_destructors': 1, },
+ 'dependencies': [
+ 'content_resources',
+ ],
'includes': [
'content_common.gypi',
],
- 'conditions': [
- ['OS != "ios"', {
- 'dependencies': [
- 'content_resources',
- ],
- }],
- ],
# Disable c4267 warnings until we fix size_t to int truncations.
'msvs_disabled_warnings': [ 4267, ],
},
- ],
- 'conditions': [
- ['OS != "ios"', {
- 'targets': [
- {
+ {
# GN version: //content/child and //content/public/child
- 'target_name': 'content_child',
- 'type': 'static_library',
- 'variables': { 'enable_wexit_time_destructors': 1, },
- 'includes': [
- 'content_child.gypi',
- ],
- 'dependencies': [
- 'content_resources',
- ],
- # Disable c4267 warnings until we fix size_t to int truncations.
- 'msvs_disabled_warnings': [ 4267, ],
- },
- {
- # GN version: //content/gpu
- 'target_name': 'content_gpu',
- 'type': 'static_library',
- 'variables': { 'enable_wexit_time_destructors': 1, },
- 'includes': [
- 'content_gpu.gypi',
- ],
- 'dependencies': [
- 'content_child',
- 'content_common',
- ],
- },
- {
- # GN version: //content/plugin and //content/public/plugin
- 'target_name': 'content_plugin',
- 'type': 'static_library',
- 'variables': { 'enable_wexit_time_destructors': 1, },
- 'includes': [
- 'content_plugin.gypi',
- ],
- 'dependencies': [
- 'content_child',
- 'content_common',
- ],
- },
- {
- # GN version: //content/ppapi_plugin
- 'target_name': 'content_ppapi_plugin',
- 'type': 'static_library',
- 'variables': { 'enable_wexit_time_destructors': 1, },
- 'includes': [
- 'content_ppapi_plugin.gypi',
- ],
- # Disable c4267 warnings until we fix size_t to int truncations.
- 'msvs_disabled_warnings': [ 4267, ],
- },
- {
- # GN version: //content/renderer and //content/public/renderer
- 'target_name': 'content_renderer',
- 'type': 'static_library',
- 'variables': { 'enable_wexit_time_destructors': 1, },
- 'includes': [
- 'content_renderer.gypi',
- ],
- 'dependencies': [
- '../third_party/webrtc/modules/modules.gyp:webrtc_h264',
- 'content_child',
- 'content_common',
- 'content_resources',
- 'renderer_features',
- ],
- 'export_dependent_settings': [
- 'content_common',
- ],
- 'conditions': [
- ['chromium_enable_vtune_jit_for_v8==1', {
- 'dependencies': [
- '../v8/src/third_party/vtune/v8vtune.gyp:v8_vtune',
- ],
- }],
- ],
- },
- {
- # GN version: //content/utility and //content/public/utility
- 'target_name': 'content_utility',
- 'type': 'static_library',
- 'variables': { 'enable_wexit_time_destructors': 1, },
- 'includes': [
- 'content_utility.gypi',
- ],
+ 'target_name': 'content_child',
+ 'type': 'static_library',
+ 'variables': { 'enable_wexit_time_destructors': 1, },
+ 'includes': [
+ 'content_child.gypi',
+ ],
+ 'dependencies': [
+ 'content_resources',
+ ],
+ # Disable c4267 warnings until we fix size_t to int truncations.
+ 'msvs_disabled_warnings': [ 4267, ],
+ },
+ {
+ # GN version: //content/gpu
+ 'target_name': 'content_gpu',
+ 'type': 'static_library',
+ 'variables': { 'enable_wexit_time_destructors': 1, },
+ 'includes': [
+ 'content_gpu.gypi',
+ ],
+ 'dependencies': [
+ 'content_child',
+ 'content_common',
+ ],
+ },
+ {
+ # GN version: //content/plugin and //content/public/plugin
+ 'target_name': 'content_plugin',
+ 'type': 'static_library',
+ 'variables': { 'enable_wexit_time_destructors': 1, },
+ 'includes': [
+ 'content_plugin.gypi',
+ ],
+ 'dependencies': [
+ 'content_child',
+ 'content_common',
+ ],
+ },
+ {
+ # GN version: //content/ppapi_plugin
+ 'target_name': 'content_ppapi_plugin',
+ 'type': 'static_library',
+ 'variables': { 'enable_wexit_time_destructors': 1, },
+ 'includes': [
+ 'content_ppapi_plugin.gypi',
+ ],
+ # Disable c4267 warnings until we fix size_t to int truncations.
+ 'msvs_disabled_warnings': [ 4267, ],
+ },
+ {
+ # GN version: //content/renderer and //content/public/renderer
+ 'target_name': 'content_renderer',
+ 'type': 'static_library',
+ 'variables': { 'enable_wexit_time_destructors': 1, },
+ 'includes': [
+ 'content_renderer.gypi',
+ ],
+ 'dependencies': [
+ '../third_party/webrtc/modules/modules.gyp:webrtc_h264',
+ 'content_child',
+ 'content_common',
+ 'content_resources',
+ 'renderer_features',
+ ],
+ 'export_dependent_settings': [
+ 'content_common',
+ ],
+ 'conditions': [
+ ['chromium_enable_vtune_jit_for_v8==1', {
'dependencies': [
- 'content_child',
- 'content_common',
- 'content_common_mojo_bindings.gyp:content_common_mojo_bindings',
+ '../v8/src/third_party/vtune/v8vtune.gyp:v8_vtune',
],
- },
+ }],
],
- }],
+ },
+ {
+ # GN version: //content/utility and //content/public/utility
+ 'target_name': 'content_utility',
+ 'type': 'static_library',
+ 'variables': { 'enable_wexit_time_destructors': 1, },
+ 'includes': [
+ 'content_utility.gypi',
+ ],
+ 'dependencies': [
+ 'content_child',
+ 'content_common',
+ 'content_common_mojo_bindings.gyp:content_common_mojo_bindings',
+ ],
+ },
],
},
{ # component != static_library
« no previous file with comments | « content/browser/BUILD.gn ('k') | content/content_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698