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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: gfx/gfx.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') | « gfx/codec/jpeg_codec.cc ('k') | third_party/iccjpeg/iccjpeg.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gfx/gfx.gyp
===================================================================
--- gfx/gfx.gyp (revision 67381)
+++ gfx/gfx.gyp (working copy)
@@ -79,7 +79,6 @@
'../skia/skia.gyp:skia',
'../third_party/icu/icu.gyp:icui18n',
'../third_party/icu/icu.gyp:icuuc',
- '../third_party/libjpeg/libjpeg.gyp:libjpeg',
'../third_party/libpng/libpng.gyp:libpng',
'../third_party/zlib/zlib.gyp:zlib',
'gfx_resources',
@@ -176,7 +175,16 @@
'native_widget_types_gtk.cc',
],
}],
- ],
+ ['libjpeg_turbo==1', {
+ 'dependencies': [
+ '../third_party/libjpeg_turbo/libjpeg.gyp:libjpeg',
+ ],
+ }, {
+ 'dependencies': [
+ '../third_party/libjpeg/libjpeg.gyp:libjpeg',
+ ],
+ }],
+ ],
},
{
# theme_resources also generates a .cc file, so it can't use the rules above.
« build/common.gypi ('K') | « gfx/codec/jpeg_codec.cc ('k') | third_party/iccjpeg/iccjpeg.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698