| Index: gyp/codec.gyp
|
| diff --git a/gyp/codec.gyp b/gyp/codec.gyp
|
| index 0d541845827d8b9c86b250eaf1a3d9e06ad082f4..c008590dad4c859d1d57ecb9e72f8088e2c2e9b7 100644
|
| --- a/gyp/codec.gyp
|
| +++ b/gyp/codec.gyp
|
| @@ -18,9 +18,12 @@
|
| 'dependencies': [
|
| 'core.gyp:*',
|
| 'giflib.gyp:giflib',
|
| - 'libjpeg.gyp:libjpeg',
|
| + 'libjpeg-turbo.gyp:libjpeg-turbo',
|
| '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
|
| @@ -60,10 +63,23 @@
|
| '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',
|
| + ],
|
| }
|
| ]
|
| ]
|
|
|