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_exe.gypi | |
| 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_exe.gypi')
| -rw-r--r-- | chrome/chrome_exe.gypi | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/chrome/chrome_exe.gypi b/chrome/chrome_exe.gypi index 268e081..d2d02e4 100644 --- a/chrome/chrome_exe.gypi +++ b/chrome/chrome_exe.gypi @@ -190,7 +190,7 @@ '../build/linux/system.gyp:gtk', 'packed_resources', # Needed to use the master_preferences functions - 'installer/installer.gyp:installer_util', + 'installer_util', ], 'sources': [ 'app/chrome_dll_main.cc', @@ -433,7 +433,7 @@ 'conditions': [ ['branding=="Chrome"', { 'dependencies': [ - 'installer/installer.gyp:linux_installer_configs', + 'linux_installer_configs', ], }], ['selinux==0', { @@ -473,8 +473,8 @@ }], ['OS=="win"', { 'dependencies': [ - 'installer/installer.gyp:installer_util', - 'installer/installer.gyp:installer_util_strings', + 'installer_util', + 'installer_util_strings', '../breakpad/breakpad.gyp:breakpad_handler', '../breakpad/breakpad.gyp:breakpad_sender', '../sandbox/sandbox.gyp:sandbox', @@ -568,7 +568,7 @@ # which contains all of the library code with Chromium # functionality. 'chrome_dll_nacl_win64', - 'installer/installer.gyp:installer_util_nacl_win64', + 'installer_util_nacl_win64', 'common_constants_win64', '../breakpad/breakpad.gyp:breakpad_handler_win64', '../breakpad/breakpad.gyp:breakpad_sender_win64', |