summaryrefslogtreecommitdiffstats
path: root/chrome/chrome_common.gypi
diff options
context:
space:
mode:
authorpiman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-03 07:35:22 +0000
committerpiman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-03 07:35:22 +0000
commitb9bbf553771af0593368893fab9bfa85b5b512ed (patch)
tree1eebe684e297022fd5d0a9333c5f3bd655eb12a8 /chrome/chrome_common.gypi
parentb1fe6aaf4434a0e9b19c70118bf5f0acab62da69 (diff)
downloadchromium_src-b9bbf553771af0593368893fab9bfa85b5b512ed.zip
chromium_src-b9bbf553771af0593368893fab9bfa85b5b512ed.tar.gz
chromium_src-b9bbf553771af0593368893fab9bfa85b5b512ed.tar.bz2
Separate some generated files into their own targets
In each case you have a trivial action (a python script generating a single file), acting as a big build barrier, because gyp makes the action wait on all dependencies of the library it's part of (aka half of the world) before allowing dependent libraries to start building. Separating it out removes that barrier, significantly improving parallelism potential and build speed. BUG=None TEST=local compile tests (from scratch) + trybots Review URL: http://codereview.chromium.org/8417017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@108434 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_common.gypi')
-rw-r--r--chrome/chrome_common.gypi55
1 files changed, 32 insertions, 23 deletions
diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi
index 9c2c4c2..136b275 100644
--- a/chrome/chrome_common.gypi
+++ b/chrome/chrome_common.gypi
@@ -27,6 +27,7 @@
'chrome_strings',
'common_constants',
'common_net',
+ 'common_version',
'default_plugin/default_plugin.gyp:default_plugin',
'theme_resources',
'../base/base.gyp:base',
@@ -268,10 +269,39 @@
'default_plugin/default_plugin.gyp:default_plugin',
],
}],
- ['os_posix == 1 and OS != "mac"', {
+ ['OS=="linux" and selinux==1', {
+ 'dependencies': [
+ '../build/linux/system.gyp:selinux',
+ ],
+ }],
+ ['OS=="mac"', {
+ 'dependencies': [
+ '../third_party/mach_override/mach_override.gyp:mach_override',
+ ],
'include_dirs': [
- '<(SHARED_INTERMEDIATE_DIR)',
+ '../third_party/GTM',
+ ],
+ }],
+ ['remoting==1', {
+ 'dependencies': [
+ '../remoting/remoting.gyp:remoting_client_plugin',
],
+ }],
+ ],
+ 'export_dependent_settings': [
+ '../base/base.gyp:base',
+ ],
+ },
+ {
+ 'target_name': 'common_version',
+ 'type': 'none',
+ 'conditions': [
+ ['os_posix == 1 and OS != "mac"', {
+ 'direct_dependent_settings': {
+ 'include_dirs': [
+ '<(SHARED_INTERMEDIATE_DIR)',
+ ],
+ },
# Because posix_version generates a header, we must set the
# hard_dependency flag.
'hard_dependency': 1,
@@ -320,27 +350,6 @@
},
],
}],
- ['OS=="linux" and selinux==1', {
- 'dependencies': [
- '../build/linux/system.gyp:selinux',
- ],
- }],
- ['OS=="mac"', {
- 'dependencies': [
- '../third_party/mach_override/mach_override.gyp:mach_override',
- ],
- 'include_dirs': [
- '../third_party/GTM',
- ],
- }],
- ['remoting==1', {
- 'dependencies': [
- '../remoting/remoting.gyp:remoting_client_plugin',
- ],
- }],
- ],
- 'export_dependent_settings': [
- '../base/base.gyp:base',
],
},
{