diff options
| author | rogerm@google.com <rogerm@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-09 00:02:40 +0000 |
|---|---|---|
| committer | rogerm@google.com <rogerm@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-09 00:02:40 +0000 |
| commit | 991bc8828f4f346321615424087b81f0158eabf8 (patch) | |
| tree | 6effd15a3dd6a15c0dbebae61f66ce6877b26a22 /chrome/chrome_exe.gypi | |
| parent | adb33340eddb84cc1624da4e78e8de63ed655594 (diff) | |
| download | chromium_src-991bc8828f4f346321615424087b81f0158eabf8.zip chromium_src-991bc8828f4f346321615424087b81f0158eabf8.tar.gz chromium_src-991bc8828f4f346321615424087b81f0158eabf8.tar.bz2 | |
Revert overly-wide change in dependency chain. Now the new build step will only be enabled when the optimizations are turned on.
Review URL: http://codereview.chromium.org/7598008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95916 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_exe.gypi')
| -rw-r--r-- | chrome/chrome_exe.gypi | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/chrome/chrome_exe.gypi b/chrome/chrome_exe.gypi index 73e4cad..69b8a61 100644 --- a/chrome/chrome_exe.gypi +++ b/chrome/chrome_exe.gypi @@ -428,13 +428,21 @@ ], }], ['OS=="win"', { + 'conditions': [ + ['optimize_with_syzygy==1', { + # With syzygy enabled there is an intermediate target which + # builds an initial version of chrome_dll, then optimizes it + # to its final location. The optimization step also + # depends on chrome_exe, so here we depend on the initial + # chrome_dll. + 'dependencies': ['chrome_dll_initial',] + }, { + 'dependencies': ['chrome_dll',] + }], + ], + }], + ['OS=="win"', { 'dependencies': [ - # On Windows there is an intermediate target which builds an - # initial version of chrome_dll, then either optimizes it or - # copies to its final location. The optimization step also - # depends on chrome_exe, so here we depend on the initial - # chrome_dll. - 'chrome_dll_initial', 'chrome_version_resources', 'installer_util', 'installer_util_strings', |