Title: [91730] trunk/Source/WebKit/chromium
- Revision
- 91730
- Author
- [email protected]
- Date
- 2011-07-25 17:40:22 -0700 (Mon, 25 Jul 2011)
Log Message
[chromium] Don't link in both libjpeg and libjpeg_turbo in the components build
https://bugs.webkit.org/show_bug.cgi?id=65138
Reviewed by James Robinson.
* WebKit.gyp:
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (91729 => 91730)
--- trunk/Source/WebKit/chromium/ChangeLog 2011-07-26 00:31:41 UTC (rev 91729)
+++ trunk/Source/WebKit/chromium/ChangeLog 2011-07-26 00:40:22 UTC (rev 91730)
@@ -1,3 +1,12 @@
+2011-07-25 Nico Weber <[email protected]>
+
+ [chromium] Don't link in both libjpeg and libjpeg_turbo in the components build
+ https://bugs.webkit.org/show_bug.cgi?id=65138
+
+ Reviewed by James Robinson.
+
+ * WebKit.gyp:
+
2011-07-25 Chris Rogers <[email protected]>
Update Chromium DRT to output binary (instead of base64-encoded) data for web audio testing
Modified: trunk/Source/WebKit/chromium/WebKit.gyp (91729 => 91730)
--- trunk/Source/WebKit/chromium/WebKit.gyp 2011-07-26 00:31:41 UTC (rev 91729)
+++ trunk/Source/WebKit/chromium/WebKit.gyp 2011-07-26 00:40:22 UTC (rev 91730)
@@ -612,7 +612,7 @@
'<(chromium_src_dir)/testing/gtest.gyp:gtest',
'<(chromium_src_dir)/testing/gmock.gyp:gmock',
'<(chromium_src_dir)/third_party/icu/icu.gyp:*',
- '<(chromium_src_dir)/third_party/libjpeg/libjpeg.gyp:libjpeg',
+ '<(chromium_src_dir)/third_party/libjpeg_turbo/libjpeg.gyp:libjpeg',
'<(chromium_src_dir)/third_party/libpng/libpng.gyp:libpng',
'<(chromium_src_dir)/third_party/libxml/libxml.gyp:libxml',
'<(chromium_src_dir)/third_party/libxslt/libxslt.gyp:libxslt',
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
