diff options
| author | caitkp@chromium.org <caitkp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-18 20:27:03 +0000 |
|---|---|---|
| committer | caitkp@chromium.org <caitkp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-18 20:27:03 +0000 |
| commit | 9d0c62c2749c51e7e7db4f9d92a36ae7687d093a (patch) | |
| tree | 71878866590a449b87accf93be07ea56034ee826 /chrome_elf | |
| parent | 0475b9b689d164be0fd8d352ffb7754b6ee34d56 (diff) | |
| download | chromium_src-9d0c62c2749c51e7e7db4f9d92a36ae7687d093a.zip chromium_src-9d0c62c2749c51e7e7db4f9d92a36ae7687d093a.tar.gz chromium_src-9d0c62c2749c51e7e7db4f9d92a36ae7687d093a.tar.bz2 | |
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
Diffstat (limited to 'chrome_elf')
| -rw-r--r-- | chrome_elf/chrome_elf.gyp | 29 |
1 files changed, 28 insertions, 1 deletions
diff --git a/chrome_elf/chrome_elf.gyp b/chrome_elf/chrome_elf.gyp index 83514e7..3db44c6 100644 --- a/chrome_elf/chrome_elf.gyp +++ b/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', + ], + }], + ], }, ], }], |