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

Unified Diff: third_party/iccjpeg/iccjpeg.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/gfx.gyp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/iccjpeg/iccjpeg.gyp
===================================================================
--- third_party/iccjpeg/iccjpeg.gyp (revision 67381)
+++ third_party/iccjpeg/iccjpeg.gyp (working copy)
@@ -8,9 +8,6 @@
'target_name': 'iccjpeg',
'product_name': 'iccjpeg',
'type': '<(library)',
- 'dependencies': [
- '../libjpeg/libjpeg.gyp:libjpeg',
- ],
'sources': [
'iccjpeg.c',
'iccjpeg.h',
@@ -20,6 +17,17 @@
'.',
],
},
+ 'conditions': [
+ ['libjpeg_turbo==1', {
+ 'dependencies': [
+ '../libjpeg_turbo/libjpeg.gyp:libjpeg',
+ ],
+ }, {
+ 'dependencies': [
+ '../libjpeg/libjpeg.gyp:libjpeg',
+ ],
+ }],
+ ],
},
],
}
« build/common.gypi ('K') | « gfx/gfx.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698