diff options
| author | csharp@chromium.org <csharp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-27 17:15:05 +0000 |
|---|---|---|
| committer | csharp@chromium.org <csharp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-27 17:15:05 +0000 |
| commit | e5890e1e8f97eb873972680e85e6c76ea3bc6923 (patch) | |
| tree | a9cad560057361f14d3506a4d0ce9dc3522b87c7 /chrome_elf/chrome_elf.gyp | |
| parent | 66c12e88d5df69057be30fcd93359ec73bc6362a (diff) | |
| download | chromium_src-e5890e1e8f97eb873972680e85e6c76ea3bc6923.zip chromium_src-e5890e1e8f97eb873972680e85e6c76ea3bc6923.tar.gz chromium_src-e5890e1e8f97eb873972680e85e6c76ea3bc6923.tar.bz2 | |
Link chrome_elf.dll instead of statically linking the blacklist code
This ensure that the dll code is referenced, instead of the target
making its own copy.
TBR=sky@chromium.org
BUG=329023
Review URL: https://codereview.chromium.org/181373003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@253847 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_elf/chrome_elf.gyp')
| -rw-r--r-- | chrome_elf/chrome_elf.gyp | 23 |
1 files changed, 22 insertions, 1 deletions
diff --git a/chrome_elf/chrome_elf.gyp b/chrome_elf/chrome_elf.gyp index fa6ed36..5820fc2 100644 --- a/chrome_elf/chrome_elf.gyp +++ b/chrome_elf/chrome_elf.gyp @@ -126,7 +126,7 @@ ], }, { - 'target_name': 'chrome_elf_common', + 'target_name': 'chrome_elf_constants', 'type': 'static_library', 'include_dirs': [ '..', @@ -134,6 +134,27 @@ 'sources': [ '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', + 'type': 'static_library', + 'dependencies': [ + 'chrome_elf_constants', + ], + 'include_dirs': [ + '..', + ], + 'sources': [ 'chrome_elf_types.h', 'chrome_elf_util.cc', 'chrome_elf_util.h', |