Revert of Switch SkJpegCode to libjpeg-turbo (patchset #28 id:710001 of https://codereview.chromium.org/1180983002/)
Reason for revert:
Broke iOS build.
Original issue's description:
> Add libjpeg-turbo library (depends on yasm)
> Mangle external function names to avoid conflict with libjpeg
> Take advantage of direct color conversion (RGBA, BGRA, 565)
> Prepare to use jpeg_skip_scanlines (when it is upstreamed)
>
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/b60c3f8291529303299262dba19b1a896060bd2d
>
> Committed: https://skia.googlesource.com/skia/+/f8bf9181d7b0463c8e371755cfbb9ece90b34fc5
>
> Committed: https://skia.googlesource.com/skia/+/e9e3ee33f30c14c31afd5fc3fe4dda7f15783c75
TBR=scroggo@google.com,djsollen@google.com,emmaleer@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review URL: https://codereview.chromium.org/1213093003
diff --git a/gyp/codec.gyp b/gyp/codec.gyp
index c008590..0d54184 100644
--- a/gyp/codec.gyp
+++ b/gyp/codec.gyp
@@ -18,12 +18,9 @@
'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
# http://build.chromium.org/p/client.skia.compile/builders/Build-Ubuntu-GCC-x86_64-Release-Trybot/builds/113/steps/build%20most/logs/stdio
@@ -63,23 +60,10 @@
'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',
- ],
}
]
]