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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/chrome.gyp

Issue 5292007: Integrates libjpeg-turbo into Chromium (Chromium side)... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 10 years, 1 month 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
« build/common.gypi ('K') | « build/common.gypi ('k') | gfx/codec/jpeg_codec.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome.gyp
===================================================================
--- chrome/chrome.gyp (revision 67381)
+++ chrome/chrome.gyp (working copy)
@@ -1646,7 +1646,6 @@
'../third_party/codesighs/codesighs.gyp:*',
'../third_party/iccjpeg/iccjpeg.gyp:*',
'../third_party/icu/icu.gyp:*',
- '../third_party/libjpeg/libjpeg.gyp:*',
'../third_party/libpng/libpng.gyp:*',
'../third_party/libwebp/libwebp.gyp:*',
'../third_party/libxslt/libxslt.gyp:*',
@@ -1675,6 +1674,15 @@
'../base/allocator/allocator.gyp:*',
],
}],
+ ['libjpeg_turbo==1', {
+ 'dependencies': [
+ '../third_party/libjpeg_turbo/libjpeg.gyp:*',
+ ],
+ }, {
+ 'dependencies': [
+ '../third_party/libjpeg/libjpeg.gyp:*',
+ ],
+ }],
],
},
{
« build/common.gypi ('K') | « build/common.gypi ('k') | gfx/codec/jpeg_codec.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698