diff options
| author | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-24 00:35:46 +0000 |
|---|---|---|
| committer | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-24 00:35:46 +0000 |
| commit | 5c14951ae6906a26ec9b141785ba48b8313cf7e9 (patch) | |
| tree | 77a2653ea742cb99abca61c3502345ecec5fab4c /build | |
| parent | f4b8f31dde49067a092303025d4baaf47e93f491 (diff) | |
| download | chromium_src-5c14951ae6906a26ec9b141785ba48b8313cf7e9.zip chromium_src-5c14951ae6906a26ec9b141785ba48b8313cf7e9.tar.gz chromium_src-5c14951ae6906a26ec9b141785ba48b8313cf7e9.tar.bz2 | |
Break gyp cycles on Linux.
The cycle is between installer.gyp and chrome.gyp. The fix is to switch installer.gyp into installer.gypi and include it into chrome.gyp
BUG=35308
Review URL: http://codereview.chromium.org/2067018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48007 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/all.gyp | 6 | ||||
| -rwxr-xr-x | build/gyp_chromium | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/build/all.gyp b/build/all.gyp index 8e7c5de..2cee813 100644 --- a/build/all.gyp +++ b/build/all.gyp @@ -72,7 +72,7 @@ 'conditions': [ ['branding=="Chrome"', { 'dependencies': [ - '../chrome/installer/installer.gyp:linux_packages_<(channel)', + '../chrome/chrome.gyp:linux_packages_<(channel)', ], }], ], @@ -211,8 +211,10 @@ 'dependencies': [ '../app/app.gyp:app_unittests', '../chrome/chrome.gyp:browser_tests', + '../chrome/chrome.gyp:installer_util_unittests', '../chrome/chrome.gyp:interactive_ui_tests', '../chrome/chrome.gyp:memory_test', + '../chrome/chrome.gyp:mini_installer_test', '../chrome/chrome.gyp:nacl_ui_tests', '../chrome/chrome.gyp:notifier_unit_tests', '../chrome/chrome.gyp:page_cycler_tests', @@ -224,8 +226,6 @@ '../chrome/chrome.gyp:ui_tests', '../chrome/chrome.gyp:unit_tests', '../chrome/chrome.gyp:url_fetch_test', - '../chrome/installer/installer.gyp:installer_util_unittests', - '../chrome/installer/installer.gyp:mini_installer_test', # mini_installer_tests depends on mini_installer. This should be # defined in installer.gyp. '../chrome/installer/mini_installer.gyp:mini_installer', diff --git a/build/gyp_chromium b/build/gyp_chromium index 9c87e82..ab05ae9 100755 --- a/build/gyp_chromium +++ b/build/gyp_chromium @@ -79,7 +79,7 @@ if __name__ == '__main__': # violation of the rule causes Xcode to misbehave badly. # TODO(mark): Find and kill remaining circular dependencies, and remove this # option. http://crbug.com/35878. - if sys.platform != 'darwin': + if sys.platform not in ('darwin', 'linux2'): args.append('--no-circular-check') # If CHROMIUM_GYP_SYNTAX_CHECK is set to 1, it will invoke gyp with --check |