Remove the Syzygy optimization alternative from GYP configs.

chrome/chrome_dll.gypi

 # 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.
 {
   'conditions': [
     ['OS=="mac" or OS=="win"', {
       'targets': [
         {
           '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)',
+          'target_name': 'chrome_dll',

[grt (UTC plus 2), 2011/11/23 22:03:11]

ubernit: move target_name and type back above the variables block where they
were in r95609.

[Sigurður Ásgeirsson, 2011/11/23 22:25:52]

Done.

           'type': 'shared_library',
           'dependencies': [
             '<@(chromium_dependencies)',
             'app/policy/cloud_policy_codegen.gyp:policy',
           ],
           'conditions': [
             ['OS=="win"', {
               'product_name': 'chrome',
               'dependencies': [
                 # On Windows, link the dependencies (libraries) that make
@@ skipping 70 matching lines @@
                 },
               },
               'msvs_settings': {
                 'VCLinkerTool': {
                   'BaseAddress': '0x01c30000',
                   'ImportLibrary': '$(OutDir)\\lib\\chrome_dll.lib',
                   'ProgramDatabaseFile': '$(OutDir)\\chrome_dll.pdb',
                   # 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",
                     }],
                   ],
                   'DelayLoadDLLs': [
                     'comdlg32.dll',
                     'crypt32.dll',
                     'cryptui.dll',
                     'dhcpcsvc.dll',
                     'imagehlp.dll',
                     'imm32.dll',
                     'iphlpapi.dll',
                     'setupapi.dll',
                     'urlmon.dll',
                     'winhttp.dll',
                     'wininet.dll',
                     'winspool.drv',
                     'ws2_32.dll',
                     'wsock32.dll',
                   ],
                 },
                 'VCManifestTool': {
                   'AdditionalManifestFiles': '$(ProjectDir)\\app\\chrome.dll.manifest',
                 },
               },
               '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
                   # for more information. Done on the dll instead of the exe so
                   # that people launching from VS don't need to modify
                   # $(TargetPath) for the exe.
                   'msvs_postbuild': 'tools\\build\\win\\hardlink_failsafe.bat $(OutDir)\\initial\\chrome.dll $(OutDir)\\chrome.dll'
                 }]
               ]
             }],  # OS=="win"
@@ skipping 356 matching lines @@
                   ],
                 }],
               ],  # conditions
             }],  # OS=="mac"
           ],  # conditions
         },  # target chrome_dll
       ],  # targets
     }],  # OS=="mac" or OS=="win"
   ],
 }