diff options
| -rw-r--r-- | base/base.gyp | 1 | ||||
| -rw-r--r-- | build/common.gypi | 7 | ||||
| -rw-r--r-- | chrome_elf/chrome_elf.gyp | 54 |
3 files changed, 1 insertions, 61 deletions
diff --git a/base/base.gyp b/base/base.gyp index a01df7a..d12ded9 100644 --- a/base/base.gyp +++ b/base/base.gyp @@ -228,6 +228,7 @@ 'sources!': [ 'debug/debug_on_start_win.cc', ], + 'dependencies': ['../chrome_elf/chrome_elf.gyp:chrome_redirects'], }], ], }], diff --git a/build/common.gypi b/build/common.gypi index 2735ac8..d4a8ea2 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -2502,13 +2502,6 @@ ['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', - ], - }], ['video_hole==1', { 'defines': ['VIDEO_HOLE=1'], }], 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', - ], - }], - ], }, ], }], |