Only add chrome_redirects as a dependency of base.dll in component builds.

chrome_elf/chrome_elf.gyp

 # Copyright 2013 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': {
     'chromium_code': 1,
   },
   'includes': [
     '../build/util/version.gypi',
     '../build/win_precompile.gypi',
@@ skipping 22 matching lines @@
           # Set /SUBSYSTEM:WINDOWS.
           'SubSystem': '2',
           'AdditionalDependencies!': [
             'user32.lib',
           ],
           'IgnoreDefaultLibraryNames': [
             'user32.lib',
           ],
         },
       },
-      'conditions': [
-        ['component=="shared_library"', {
-          # In component builds, all targets depend on chrome_redirects by
-          # default. Remove it here to avoid a circular dependency.
-          'dependencies!': [
-            '../chrome_elf/chrome_elf.gyp:chrome_redirects',
-          ],
-        }],
-      ],
     },
     {
       'target_name': 'chrome_elf_unittests_exe',
       'product_name': 'chrome_elf_unittests',
       'type': 'executable',
       'sources': [
         'blacklist/test/blacklist_test.cc',
         'chrome_elf_util_unittest.cc',
         'create_file/chrome_create_file_unittest.cc',
         'elf_imports_unittest.cc',
         'ntdll_cache_unittest.cc',
       ],
       'include_dirs': [
         '..',
         '<(SHARED_INTERMEDIATE_DIR)',
       ],
       'dependencies': [
         'chrome_elf_lib',
         '../base/base.gyp:base',
         '../base/base.gyp:run_all_unittests',
         '../base/base.gyp:test_support_base',
         '../sandbox/sandbox.gyp:sandbox',
         '../testing/gtest.gyp:gtest',
         'blacklist',
         'blacklist_test_dll_1',
         'blacklist_test_dll_2',
         'blacklist_test_dll_3',
         'blacklist_test_main_dll',
       ],
-      'conditions': [
-        ['component=="shared_library"', {
-          # In component builds, all targets depend on chrome_redirects by
-          # default. Remove it here so we are able to test it.
-          'dependencies!': [
-            '../chrome_elf/chrome_elf.gyp:chrome_redirects',
-          ],
-        }],
-      ],
     },
     {
       # A dummy target to ensure that chrome_elf.dll and chrome.exe gets built
       # when building chrome_elf_unittests.exe without introducing an
       # explicit runtime dependency.
       'target_name': 'chrome_elf_unittests',
       'type': 'none',
       'dependencies': [
         '../chrome/chrome.gyp:chrome',
         'chrome_elf',
         'chrome_elf_unittests_exe',
       ],
     },
     {
       'target_name': 'chrome_elf_lib',
       'type': 'static_library',
       'include_dirs': [
         '..',
       ],
       'sources': [
         'create_file/chrome_create_file.cc',
         'create_file/chrome_create_file.h',
         'ntdll_cache.cc',
         'ntdll_cache.h',
       ],
       'dependencies': [
         'chrome_elf_common',
       ],
-      'conditions': [
-        ['component=="shared_library"', {
-          # In component builds, all targets depend on chrome_redirects by
-          # default. Remove it here to avoid a circular dependency.
-          'dependencies!': [
-            '../chrome_elf/chrome_elf.gyp:chrome_redirects',
-          ],
-        }],
-      ],
     },
     {
       'target_name': 'chrome_elf_constants',
       'type': 'static_library',
       'include_dirs': [
         '..',
       ],
       'sources': [
         'chrome_elf_constants.cc',
         'chrome_elf_constants.h',
       ],
-       'conditions': [
-        ['component=="shared_library"', {
-          # In component builds, all targets depend on chrome_redirects by
-          # default. Remove it here so we are able to test it.
-          'dependencies!': [
-            '../chrome_elf/chrome_elf.gyp:chrome_redirects',
-          ],
-        }],
-      ],
     },
     {
       'target_name': 'chrome_elf_common',
       'type': 'static_library',
       'dependencies': [
         'chrome_elf_constants',
       ],
       'include_dirs': [
         '..',
       ],
       'sources': [
         'chrome_elf_types.h',
         'chrome_elf_util.cc',
         'chrome_elf_util.h',
       ],
-      'conditions': [
-        ['component=="shared_library"', {
-          # In component builds, all targets depend on chrome_redirects by
-          # default. Remove it here so we are able to test it.
-          'dependencies!': [
-            '../chrome_elf/chrome_elf.gyp:chrome_redirects',
-          ],
-        }],
-      ],
     },
     {
       'target_name': 'chrome_elf_breakpad',
       'type': 'static_library',
       'include_dirs': [
         '..',
         '<(SHARED_INTERMEDIATE_DIR)',
       ],
       'sources': [
         'breakpad.cc',
@@ skipping 22 matching lines @@
           'dependencies': [
             'chrome_elf_lib',
           ],
           'msvs_settings': {
             'VCLinkerTool': {
               'BaseAddress': '0x01c10000',
               # Set /SUBSYSTEM:WINDOWS.
               'SubSystem': '2',
             },
           },
-          'conditions': [
-            ['component=="shared_library"', {
-              # In component builds, all targets depend on chrome_redirects by
-              # default. Remove it here to avoid a circular dependency.
-              'dependencies!': [
-                '../chrome_elf/chrome_elf.gyp:chrome_redirects',
-              ],
-            }],
-          ],
         },
       ],
     }],
   ],
 }