Remove the Syzygy optimization alternative from GYP configs.

R=robertshield@chromium.org,rogerm@chromium.org


Review URL: http://codereview.chromium.org/8685001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111488 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 5 insertions, 88 deletions

diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index dfadbd0..8de23bc 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -124,7 +124,6 @@
     'chrome_common.gypi',
     'chrome_dll.gypi',
     'chrome_exe.gypi',
-    'chrome_dll_syzygy.gypi',  # This must follow chrome_dll and chrome_exe.
     'chrome_installer.gypi',
     'chrome_installer_util.gypi',
     'chrome_renderer.gypi',
diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi
index 83fde92..08dd557 100644
--- a/chrome/chrome_dll.gypi
+++ b/chrome/chrome_dll.gypi
@@ -6,24 +6,11 @@
     ['OS=="mac" or OS=="win"', {
       'targets': [
         {
+          'target_name': 'chrome_dll',
+          'type': 'shared_library',
           'variables': {
             'enable_wexit_time_destructors': 1,
-            'conditions' : [
-              ['OS=="win" and optimize_with_syzygy==1', {
-                # On Windows we use build chrome_dll as an intermediate target
-                # then have a subsequent step which either optimizes it to its
-                # final location, or copies it to its final location, depending
-                # on whether or not optimize_with_syzygy==1.  Please, refer to
-                # chrome_dll_syzygy.gypi for the subsequent defintion of the
-                # Windows chrome_dll target.
-                'dll_target_name': 'chrome_dll_initial',
-              }, {
-                'dll_target_name': 'chrome_dll',
-              }],
-            ],
           },
-          'target_name': '<(dll_target_name)',
-          'type': 'shared_library',
           'dependencies': [
             '<@(chromium_dependencies)',
             'app/policy/cloud_policy_codegen.gyp:policy',
@@ -113,13 +100,7 @@
                   # Set /SUBSYSTEM:WINDOWS for chrome.dll (for consistency).
                   'SubSystem': '2',
                   'conditions': [
-                    ['optimize_with_syzygy==1', {
-                      # When syzygy is enabled we use build chrome_dll as an
-                      # intermediate target then have a subsequent step which
-                      # optimizes it to its final location
-                      'ProgramDatabaseFile': '$(OutDir)\\initial\\chrome_dll.pdb',
-                      'OutputFile': '$(OutDir)\\initial\\chrome.dll',
-                    }], ['incremental_chrome_dll==1', {
+                    ['incremental_chrome_dll==1', {
                       'OutputFile': '$(OutDir)\\initial\\chrome.dll',
                       'UseLibraryDependencyInputs': "true",
                     }],
@@ -146,7 +127,7 @@
                 },
               },
               'conditions': [
-                ['incremental_chrome_dll==1 and optimize_with_syzygy==0', {
+                ['incremental_chrome_dll==1', {
                   # Linking to a different directory and then hardlinking back
                   # to OutDir is a workaround to avoid having the .ilk for
                   # chrome.exe and chrome.dll conflicting. See crbug.com/92528
diff --git a/chrome/chrome_dll_syzygy.gypi b/chrome/chrome_dll_syzygy.gypi
deleted file mode 100644
index 8200a25..0000000
--- a/chrome/chrome_dll_syzygy.gypi
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright (c) 2011 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-{
-  'variables': {
-    'optimize_with_syzygy%': 0,
-  },
-  'conditions': [
-    ['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',
-          'type': 'none',
-          'sources' : [],
-          'dependencies': [
-            'chrome_dll_initial',
-            'chrome',
-          ],
-          '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)"',
-              ],
-            },
-          ],
-        },
-      ],
-    }],
-  ],
-}
diff --git a/chrome/chrome_exe.gypi b/chrome/chrome_exe.gypi
index aa83d47..7f84364 100644
--- a/chrome/chrome_exe.gypi
+++ b/chrome/chrome_exe.gypi
@@ -434,19 +434,8 @@
           },
         }],
         ['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',]
-            }],
-          ],
           'dependencies': [
+            'chrome_dll',
             'chrome_version_resources',
             'installer_util',
             'installer_util_strings',