From cfe4c52ab3126a49856ebfcf0b13ab6aeef745aa Mon Sep 17 00:00:00 2001
From: "caitkp@chromium.org"
 <caitkp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Fri, 28 Feb 2014 21:15:18 +0000
Subject: Only add chrome_redirects as a dependency of base.dll in component
 builds.

This will cover most of the CreateFile calls and save us from death by
circular gyp dependencies.

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@254231 0039d316-1c4b-4281-b951-d872f2087c98
---
 chrome_elf/chrome_elf.gyp | 54 -----------------------------------------------
 1 file changed, 54 deletions(-)

(limited to 'chrome_elf')

diff --git a/chrome_elf/chrome_elf.gyp b/chrome_elf/chrome_elf.gyp
index 5820fc2..e564aa76 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',
-              ],
-            }],
-          ],
         },
       ],
     }],
-- 
cgit v1.1