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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: app/app_base.gypi

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.gyp ('k') | build/all.gyp » ('j') | build/common.gypi » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: app/app_base.gypi
===================================================================
--- app/app_base.gypi (revision 67381)
+++ app/app_base.gypi (working copy)
@@ -75,7 +75,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/sqlite/sqlite.gyp:sqlite',
'../third_party/zlib/zlib.gyp:zlib',
@@ -400,6 +399,15 @@
'keyboard_codes_posix.h',
],
}],
+ ['libjpeg_turbo==1', {
+ 'dependencies': [
+ '../third_party/libjpeg_turbo/libjpeg.gyp:libjpeg',
+ ],
+ }, {
+ 'dependencies': [
+ '../third_party/libjpeg/libjpeg.gyp:libjpeg',
+ ],
+ }],
],
},
],
« app/app.gyp ('K') | « app/app.gyp ('k') | build/all.gyp » ('j') | build/common.gypi » ('J')

Powered by Google App Engine
This is Rietveld 408576698