Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1815)

Unified Diff: chrome/chrome_exe.gypi

Issue 7598008: Revert overly-wide change in dependency chain. Now the new build step will only be enabled when ... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: CL post merge resolution Created 9 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/chrome_dll_syzygy.gypi ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_exe.gypi
===================================================================
--- chrome/chrome_exe.gypi (revision 95883)
+++ chrome/chrome_exe.gypi (working copy)
@@ -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',
« no previous file with comments | « chrome/chrome_dll_syzygy.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698