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

Unified Diff: gyp/codec.gyp

Issue 1213093003: Revert of Switch SkJpegCode to libjpeg-turbo (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 5 years, 6 months 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
« no previous file with comments | « dm/DM.cpp ('k') | gyp/libjpeg-turbo.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gyp/codec.gyp
diff --git a/gyp/codec.gyp b/gyp/codec.gyp
index c008590dad4c859d1d57ecb9e72f8088e2c2e9b7..0d541845827d8b9c86b250eaf1a3d9e06ad082f4 100644
--- a/gyp/codec.gyp
+++ b/gyp/codec.gyp
@@ -18,11 +18,8 @@
'dependencies': [
'core.gyp:*',
'giflib.gyp:giflib',
- 'libjpeg-turbo.gyp:libjpeg-turbo',
+ 'libjpeg.gyp:libjpeg',
'libwebp.gyp:libwebp',
- ],
- 'export_dependent_settings': [
- 'libjpeg-turbo.gyp:libjpeg-turbo',
],
'cflags':[
# FIXME: This gets around a longjmp warning. See
@@ -63,22 +60,9 @@
'dependencies': [
'libpng.gyp:libpng',
],
- # TODO(msarett): update libjpeg-turbo on Android so we can compile SkJpegCodec
- # for the framework.
- 'sources!': [
- '../src/codec/SkJpegCodec.cpp',
- '../src/codec/SkJpegDecoderMgr.cpp',
- '../src/codec/SkJpegUtility_codec.cpp',
- ],
- 'dependencies!': [
- 'libjpeg-turbo.gyp:libjpeg-turbo',
- ],
}, { # !skia_android_framework
'dependencies': [
'libpng.gyp:libpng_static',
- ],
- 'cflags': [
- '-DTURBO_HAS_SKIP',
],
}
]
« no previous file with comments | « dm/DM.cpp ('k') | gyp/libjpeg-turbo.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698