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 /chrome/chrome.gyp | |
| 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 'chrome/chrome.gyp')
| -rw-r--r-- | chrome/chrome.gyp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 87b8949..7ea3601 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -37,7 +37,7 @@ 'nacl_win64_dependencies': [ 'common_nacl_win64', 'common_constants_win64', - 'installer/installer.gyp:installer_util_nacl_win64', + 'installer_util_nacl_win64', ], 'allocator_target': '../base/allocator/allocator.gyp:allocator', 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome', @@ -124,6 +124,8 @@ 'chrome_common.gypi', 'chrome_dll.gypi', 'chrome_exe.gypi', + 'chrome_installer.gypi', + 'chrome_installer_util.gypi', 'chrome_renderer.gypi', 'chrome_tests.gypi', 'common_constants.gypi', @@ -225,7 +227,7 @@ # will always get built before installer_util. 'type': 'dummy_executable', 'dependencies': ['../build/win/system.gyp:cygwin', - 'installer/installer.gyp:installer_util_strings',], + 'installer_util_strings',], }, { 'type': 'none', }], @@ -1361,7 +1363,6 @@ 'type': 'none', 'dependencies': [ 'installer/mini_installer.gyp:*', - 'installer/installer.gyp:*', '../app/app.gyp:*', '../base/base.gyp:*', '../chrome_frame/chrome_frame.gyp:*', @@ -1551,7 +1552,7 @@ 'msvs_guid': '89C1C190-A5D1-4EC4-BD6A-67FF2195C7CC', 'dependencies': [ 'common_constants', - 'installer/installer.gyp:installer_util', + 'installer_util', '../base/base.gyp:base', '../breakpad/breakpad.gyp:breakpad_handler', '../breakpad/breakpad.gyp:breakpad_sender', |