Hook up redirects for 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 83514e73670541d8b6ddb75b63a8d780da09a97a..1fea1c0eaef102d7ad383fb7029f24ceb0fc7a56 100644
--- a/chrome_elf/chrome_elf.gyp
+++ b/chrome_elf/chrome_elf.gyp
@@ -67,6 +67,15 @@
         '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 to avoid a circular dependency.

[robertshield, 2014/02/06 01:39:29]

Is the circular dependency really the reason for removing chrome_redirects from
the test targets?

[Cait (Slow), 2014/02/07 17:37:52]

Done.

+          'dependencies!': [
+            '../chrome_elf/chrome_elf.gyp:chrome_redirects',
+          ],
+        }],
+      ],
     },
     {
       # A dummy target to ensure that chrome_elf.dll and chrome.exe gets build

[robertshield, 2014/02/06 01:39:29]

nit: build->built

[Cait (Slow), 2014/02/07 17:37:52]

Done.

@@ -95,6 +104,15 @@
         'ntdll_cache.cc',
         'ntdll_cache.h',
       ],
+      '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',
+          ],
+        }],
+      ],
     },
   ], # targets
   'conditions': [
@@ -119,6 +137,15 @@
               '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',
+              ],
+            }],
+          ],
         },
       ],
     }],