Revert of Enable incremental linking for static_library too

build/common.gypi

 # Copyright (c) 2012 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.
 
 # IMPORTANT:
 # Please don't directly include this file if you are building via gyp_chromium,
 # since gyp_chromium is automatically forcing its inclusion.
 {
   # Variables expected to be overriden on the GYP command line (-D) or by
   # ~/.gyp/include.gypi.
@@ skipping 1885 matching lines @@
           }],
           ['component=="shared_library"', {
             'win_use_allocator_shim%': 0,
           },{
             # Turn on multiple dll by default on Windows when in static_library.
             'chrome_multiple_dll%': 1,
           }],
           ['asan==1', {
             'win_use_allocator_shim%': 0,
           }],
-          ['buildtype!="Official"', {
-            # Not enabled in Official because it adds padding to builds.
-            # Enabled for both shared_library and static_library on an
-            # experimental basis to see if it improves windows cycle times,
-            # see http://crbug.com/404809.
+          ['component=="shared_library" and "<(GENERATOR)"=="ninja"', {
+            # Only enabled by default for ninja because it's buggy in VS.
+            # Not enabled for component=static_library because some targets
+            # are too large and the toolchain fails due to the size of the
+            # .obj files.
             'incremental_chrome_dll%': 1,
           }],
           # Don't do incremental linking for large modules on 32-bit or when
           # component=static_library as the toolchain fails due to the size of
           # the .ilk files.
           ['MSVS_OS_BITS==32 or component=="static_library"', {
             'msvs_large_module_debug_link_mode%': '1',  # No
           },{
             'msvs_large_module_debug_link_mode%': '2',  # Yes
           }],
@@ skipping 1391 matching lines @@
             # LinkIncremental is a tri-state boolean, where 0 means default
             # (i.e., inherit from parent solution), 1 means false, and
             # 2 means true.
             'LinkIncremental': '1',
             # This corresponds to the /PROFILE flag which ensures the PDB
             # file contains FIXUP information (growing the PDB file by about
             # 5%) but does not otherwise alter the output binary. This
             # information is used by the Syzygy optimization tool when
             # decomposing the release image.
             'Profile': 'true',
-
-            'conditions': [
-              ['incremental_chrome_dll', {
-                # During bring-up of Release incremental, have the linker emit
-                # a one line diagnostic describing why incremental linking
-                # failed, when it does. http://crbug.com/404809.
-                'AdditionalOptions': [
-                  '/verbose:incr',
-                ],
-              }],
-            ],
           },
         },
         'conditions': [
           ['msvs_use_common_release', {
             'includes': ['release.gypi'],
           }],
           ['release_valgrind_build==0 and tsan==0', {
             'defines': [
               'NVALGRIND',
               'DYNAMIC_ANNOTATIONS_ENABLED=0',
@@ skipping 2373 matching lines @@
     # settings in target dicts.  SYMROOT is a special case, because many other
     # Xcode variables depend on it, including variables such as
     # PROJECT_DERIVED_FILE_DIR.  When a source group corresponding to something
     # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
     # files to appear (when present) in the UI as actual files and not red
     # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
     # and therefore SYMROOT, needs to be set at the project level.
     'SYMROOT': '<(DEPTH)/xcodebuild',
   },
 }