diff options
| author | nsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-22 17:13:57 +0000 |
|---|---|---|
| committer | nsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-22 17:13:57 +0000 |
| commit | 1abd61f7cb060fb1e5ccd1546ac1aa157a1801a5 (patch) | |
| tree | 3cfe1e052fb6a1b240e194e2ac3e70580eea9e59 | |
| parent | 4ea3bd5d7efe66915a8727be8cdb1220bc093c4b (diff) | |
| download | chromium_src-1abd61f7cb060fb1e5ccd1546ac1aa157a1801a5.zip chromium_src-1abd61f7cb060fb1e5ccd1546ac1aa157a1801a5.tar.gz chromium_src-1abd61f7cb060fb1e5ccd1546ac1aa157a1801a5.tar.bz2 | |
Make sure installer_util_string is always built before
installer_util. It was triggering a bug in Incredibuild.
By making one of the dependent of install_util a dummy_executable,
and making this dummy_executable depends on installer_utils_strings,
the odds that it triggers a bug is a lot smaller. I tried 6 clobber
builds so far and none of them failed.
Review URL: http://codereview.chromium.org/155923
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21283 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/chrome.gyp | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 0381a2f..2f04d15 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -151,8 +151,22 @@ # of the static libraries currently have circular dependencies among # generated headers. 'target_name': 'chrome_strings', - 'type': 'none', 'msvs_guid': 'D9DDAF60-663F-49CC-90DC-3D08CC3D1B28', + 'conditions': [ + ['OS=="win"', { + # HACK(nsylvain): We want to enforce a fake dependency on + # intaller_util_string. install_util depends on both + # chrome_strings and installer_util_strings, but for some reasons + # Incredibuild does not enforce it (most likely a bug). By changing + # the type and making sure we depend on installer_util_strings, it + # will always get built before installer_util. + 'type': 'dummy_executable', + 'dependencies': ['../build/win/system.gyp:cygwin', + 'installer/installer.gyp:installer_util_strings',], + }, { + 'type': 'none', + }], + ], 'rules': [ { 'rule_name': 'grit', @@ -197,11 +211,6 @@ '<(grit_out_dir)', ], }, - 'conditions': [ - ['OS=="win"', { - 'dependencies': ['../build/win/system.gyp:cygwin'], - }], - ], }, { # theme_resources also generates a .cc file, so it can't use the rules above. |