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_frame | |
| 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_frame')
| -rw-r--r-- | chrome_frame/chrome_frame.gyp | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/chrome_frame/chrome_frame.gyp b/chrome_frame/chrome_frame.gyp index 817f948..947769a 100644 --- a/chrome_frame/chrome_frame.gyp +++ b/chrome_frame/chrome_frame.gyp @@ -181,7 +181,7 @@ 'dependencies': [ # TODO(slightlyoff): Get automation targets working on OS X '../chrome/chrome.gyp:automation', - '../chrome/installer/installer.gyp:installer_util', + '../chrome/chrome.gyp:installer_util', '../google_update/google_update.gyp:google_update', ], 'configurations': { @@ -285,7 +285,7 @@ }, 'dependencies': [ '../chrome/chrome.gyp:automation', - '../chrome/installer/installer.gyp:installer_util', + '../chrome/chrome.gyp:installer_util', '../google_update/google_update.gyp:google_update', ] }], @@ -338,11 +338,10 @@ 'conditions': [ ['OS=="win"', { 'dependencies': [ - '../chrome/chrome.gyp:automation', '../breakpad/breakpad.gyp:breakpad_handler', - '../chrome/installer/installer.gyp:installer_util', + '../chrome/chrome.gyp:automation', + '../chrome/chrome.gyp:installer_util', '../google_update/google_update.gyp:google_update', - '../chrome/installer/installer.gyp:installer_util', ], 'sources': [ '../base/test/test_file_util_win.cc', @@ -408,7 +407,7 @@ '../breakpad/breakpad.gyp:breakpad_handler', '../chrome/chrome.gyp:automation', '../chrome/chrome.gyp:chrome_dll_version', - '../chrome/installer/installer.gyp:installer_util', + '../chrome/chrome.gyp:installer_util', '../google_update/google_update.gyp:google_update', ], 'configurations': { @@ -475,7 +474,7 @@ 'dependencies': [ # TODO(slightlyoff): Get automation targets working on OS X '../chrome/chrome.gyp:automation', - '../chrome/installer/installer.gyp:installer_util', + '../chrome/chrome.gyp:installer_util', '../google_update/google_update.gyp:google_update', ] }], @@ -708,7 +707,7 @@ # Make the archive build happy. '../chrome/chrome.gyp:syncapi', # Installer - '../chrome/installer/installer.gyp:installer_util', + '../chrome/chrome.gyp:installer_util', '../google_update/google_update.gyp:google_update', # Crash Reporting 'crash_reporting/crash_reporting.gyp:crash_report', @@ -798,7 +797,7 @@ # Make the archive build happy. '../chrome/chrome.gyp:syncapi', # Installer - '../chrome/installer/installer.gyp:installer_util', + '../chrome/chrome.gyp:installer_util', '../google_update/google_update.gyp:google_update', # Crash Reporting 'crash_reporting/crash_reporting.gyp:crash_report', |