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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: build/all.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
« app/app.gyp ('K') | « app/app_base.gypi ('k') | build/common.gypi » ('j') | build/common.gypi » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/all.gyp
===================================================================
--- build/all.gyp (revision 67381)
+++ build/all.gyp (working copy)
@@ -33,7 +33,6 @@
'../third_party/ffmpeg/ffmpeg.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/libxml/libxml.gyp:*',
@@ -136,6 +135,15 @@
'../remoting/remoting.gyp:*',
],
}],
+ ['libjpeg_turbo==1', {
+ 'dependencies': [
+ '../third_party/libjpeg_turbo/libjpeg.gyp:*',
+ ],
+ }, {
+ 'dependencies': [
+ '../third_party/libjpeg/libjpeg.gyp:*',
+ ],
+ }],
['use_openssl!=1', {
'dependencies': [
'../net/third_party/nss/ssl.gyp:*',
« app/app.gyp ('K') | « app/app_base.gypi ('k') | build/common.gypi » ('j') | build/common.gypi » ('J')

Powered by Google App Engine
This is Rietveld 408576698