From 991bc8828f4f346321615424087b81f0158eabf8 Mon Sep 17 00:00:00 2001 From: "rogerm@google.com" Date: Tue, 9 Aug 2011 00:02:40 +0000 Subject: 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 --- chrome/chrome_dll_syzygy.gypi | 80 +++++++++++++++---------------------------- 1 file changed, 28 insertions(+), 52 deletions(-) (limited to 'chrome/chrome_dll_syzygy.gypi') diff --git a/chrome/chrome_dll_syzygy.gypi b/chrome/chrome_dll_syzygy.gypi index 0042ec9..8200a25 100644 --- a/chrome/chrome_dll_syzygy.gypi +++ b/chrome/chrome_dll_syzygy.gypi @@ -6,7 +6,13 @@ 'optimize_with_syzygy%': 0, }, 'conditions': [ - ['OS=="win"', { + ['OS=="win" and optimize_with_syzygy==1', { + # Optimize the initial chrome DLL file, placing the optimized + # output and corresponding PDB file into the product directory. + # If fastbuild!=0 then no PDB files are generated by the build + # and the syzygy optimizations cannot run (they use the PDB + # information to properly understand the DLLs contents), so + # syzygy optimization cannot be performed. 'targets': [ { 'target_name': 'chrome_dll', @@ -16,59 +22,29 @@ 'chrome_dll_initial', 'chrome', ], - 'conditions': [ - ['optimize_with_syzygy==1 and fastbuild==0', { - # Optimize the initial chrome DLL file, placing the optimized - # output and corresponding PDB file into the product directory. - # If fastbuild!=0 then no PDB files are generated by the build - # and the syzygy optimizations cannot run (they use the PDB - # information to properly understand the DLLs contents), so - # syzygy optimization cannot be performed. - 'actions': [ - { - 'action_name': 'Optimize Chrome binaries with syzygy', - 'msvs_cygwin_shell': 0, - 'inputs': [ - '<(PRODUCT_DIR)\\initial\\chrome.dll', - '<(PRODUCT_DIR)\\initial\\chrome_dll.pdb', - ], - 'outputs': [ - '<(PRODUCT_DIR)\\chrome.dll', - '<(PRODUCT_DIR)\\chrome_dll.pdb', - ], - 'action': [ - '<(DEPTH)\\third_party\\syzygy\\binaries\\optimize.bat', - '--verbose', - '--input-dir="<(PRODUCT_DIR)"', - '--input-dll="<(PRODUCT_DIR)\\initial\\chrome.dll"', - '--input-pdb="<(PRODUCT_DIR)\\initial\\chrome_dll.pdb"', - '--output-dir="<(INTERMEDIATE_DIR)\\optimized"', - '--copy-to="<(PRODUCT_DIR)"', - ], - }, + 'actions': [ + { + 'action_name': 'Optimize Chrome binaries with syzygy', + 'msvs_cygwin_shell': 0, + 'inputs': [ + '<(PRODUCT_DIR)\\initial\\chrome.dll', + '<(PRODUCT_DIR)\\initial\\chrome_dll.pdb', ], - }, { # optimize_with_syzygy!=1 or fastbuild!=0 - # Copy the chrome DLL and PDB files into the product directory. - # If fastbuild!= 0 then there is no PDB file to copy. - 'copies': [ - { - 'destination': '<(PRODUCT_DIR)', - 'conditions': [ - ['fastbuild==0', { - 'files': [ - '<(PRODUCT_DIR)\\initial\\chrome.dll', - '<(PRODUCT_DIR)\\initial\\chrome_dll.pdb', - ], - }, { - 'files': [ - '<(PRODUCT_DIR)\\initial\\chrome.dll', - ], - }], - ], - }, + 'outputs': [ + '<(PRODUCT_DIR)\\chrome.dll', + '<(PRODUCT_DIR)\\chrome_dll.pdb', ], - }], # optimize_with_syzygy==0 or fastbuild==1 - ], # conditions + 'action': [ + '<(DEPTH)\\third_party\\syzygy\\binaries\\optimize.bat', + '--verbose', + '--input-dir="<(PRODUCT_DIR)"', + '--input-dll="<(PRODUCT_DIR)\\initial\\chrome.dll"', + '--input-pdb="<(PRODUCT_DIR)\\initial\\chrome_dll.pdb"', + '--output-dir="<(INTERMEDIATE_DIR)\\optimized"', + '--copy-to="<(PRODUCT_DIR)"', + ], + }, + ], }, ], }], -- cgit v1.1