Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(474)

Unified Diff: third_party/libwebp/libwebp.gyp

Issue 14328020: Linux: fix compatibility with libwebp-0.3 for use_system_libwebp=1 case. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: <(DEPTH) Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | tools/compile_test/compile_test.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/libwebp/libwebp.gyp
diff --git a/third_party/libwebp/libwebp.gyp b/third_party/libwebp/libwebp.gyp
index 1eb2217aa2e94bb256165cc6bbcc9be83f38512a..10a66154aaebd006e5a978b95358154f77439b43 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)',
],
},
}
« no previous file with comments | « no previous file | tools/compile_test/compile_test.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698