diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-18 22:08:27 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-18 22:08:27 +0000 |
| commit | 486a95a7d9b19cf79f61ab3bb98b701a043452f6 (patch) | |
| tree | 06158a8dd5fe611f3797ed649b6621da5f0bc0ac /third_party | |
| parent | 6637a295b33c1a52bde45384e5b546da4c9b2752 (diff) | |
| download | chromium_src-486a95a7d9b19cf79f61ab3bb98b701a043452f6.zip chromium_src-486a95a7d9b19cf79f61ab3bb98b701a043452f6.tar.gz chromium_src-486a95a7d9b19cf79f61ab3bb98b701a043452f6.tar.bz2 | |
Linux: fix compatibility with libwebp-0.3 for use_system_libwebp=1 case.
R=jzern
TBR=darin
BUG=none
Review URL: https://codereview.chromium.org/14328020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@195016 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/libwebp/libwebp.gyp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/third_party/libwebp/libwebp.gyp b/third_party/libwebp/libwebp.gyp index 1eb2217..10a6615 100644 --- a/third_party/libwebp/libwebp.gyp +++ b/third_party/libwebp/libwebp.gyp @@ -162,7 +162,13 @@ }, 'link_settings': { 'libraries': [ - '-lwebp', + # Check for presence of webpdemux library, use it if present. + '<!(python <(DEPTH)/tools/compile_test/compile_test.py ' + '--code "int main() { return 0; }" ' + '--run-linker ' + '--on-success "-lwebp -lwebpdemux" ' + '--on-failure "-lwebp" ' + '-- -lwebpdemux)', ], }, } |