Hook up redirects for component builds

BUG=334379

Review URL: https://codereview.chromium.org/154463002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@251823 0039d316-1c4b-4281-b951-d872f2087c98

build/common.gypi

@@ -2503,6 +2503,13 @@
       ['enable_ipc_fuzzer==1', {
         'defines': ['ENABLE_IPC_FUZZER=1'],
       }],
+      ['OS=="win" and component=="shared_library"', {
+        'dependencies': [
+          # All targets in a component build must depend on chrome_redirects,
+          # to ensure that certain calls go through it.
+          '<(DEPTH)/chrome_elf/chrome_elf.gyp:chrome_redirects',
+         ],
+      }],
     ],  # conditions for 'target_defaults'
     'target_conditions': [
       ['enable_wexit_time_destructors==1', {

chrome_elf/chrome_elf.gyp

@@ -67,9 +67,18 @@
         '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 build
+      # 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',
@@ -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',
+              ],
+            }],
+          ],
         },
       ],
     }],