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

chrome_elf/chrome_elf.gyp

Index: chrome_elf/chrome_elf.gyp
diff --git a/chrome_elf/chrome_elf.gyp b/chrome_elf/chrome_elf.gyp
index 5820fc277457d30f07dd5b8cc412c58d1b73a509..e564aa76d21ee44d2a176f8cdfcf5b4d6824a047 100644
--- a/chrome_elf/chrome_elf.gyp
+++ b/chrome_elf/chrome_elf.gyp
@@ -40,15 +40,6 @@
           ],
         },
       },
-      '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',
@@ -78,15 +69,6 @@
         '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
@@ -115,15 +97,6 @@
       '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',
@@ -135,15 +108,6 @@
         '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',
@@ -159,15 +123,6 @@
         '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',
@@ -210,15 +165,6 @@
               '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',
-              ],
-            }],
-          ],
         },
       ],
     }],