| Index: gyp/libwebp.gyp
|
| diff --git a/gyp/libwebp.gyp b/gyp/libwebp.gyp
|
| index e20f0049b01bce76457fa589e091b98a4270a787..a2f5cfdcd4725b930e60d998ef1a9fe4f110f99b 100644
|
| --- a/gyp/libwebp.gyp
|
| +++ b/gyp/libwebp.gyp
|
| @@ -16,17 +16,27 @@
|
| '../third_party/externals/libwebp',
|
| ],
|
| 'sources': [
|
| - '../third_party/externals/libwebp/dec/alpha.c',
|
| - '../third_party/externals/libwebp/dec/buffer.c',
|
| - '../third_party/externals/libwebp/dec/frame.c',
|
| - '../third_party/externals/libwebp/dec/idec.c',
|
| - '../third_party/externals/libwebp/dec/io.c',
|
| - '../third_party/externals/libwebp/dec/layer.c',
|
| - '../third_party/externals/libwebp/dec/quant.c',
|
| - '../third_party/externals/libwebp/dec/tree.c',
|
| - '../third_party/externals/libwebp/dec/vp8.c',
|
| - '../third_party/externals/libwebp/dec/vp8l.c',
|
| - '../third_party/externals/libwebp/dec/webp.c',
|
| + '../third_party/externals/libwebp/src/dec/alpha.c',
|
| + '../third_party/externals/libwebp/src/dec/buffer.c',
|
| + '../third_party/externals/libwebp/src/dec/frame.c',
|
| + '../third_party/externals/libwebp/src/dec/idec.c',
|
| + '../third_party/externals/libwebp/src/dec/io.c',
|
| + '../third_party/externals/libwebp/src/dec/layer.c',
|
| + '../third_party/externals/libwebp/src/dec/quant.c',
|
| + '../third_party/externals/libwebp/src/dec/tree.c',
|
| + '../third_party/externals/libwebp/src/dec/vp8.c',
|
| + '../third_party/externals/libwebp/src/dec/vp8l.c',
|
| + '../third_party/externals/libwebp/src/dec/webp.c',
|
| + ],
|
| + },
|
| + {
|
| + 'target_name': 'libwebp_demux',
|
| + 'type': 'static_library',
|
| + 'include_dirs': [
|
| + '../third_party/externals/libwebp',
|
| + ],
|
| + 'sources': [
|
| + '../third_party/externals/libwebp/src/demux/demux.c',
|
| ],
|
| },
|
| {
|
| @@ -36,15 +46,15 @@
|
| '../third_party/externals/libwebp',
|
| ],
|
| 'sources': [
|
| - '../third_party/externals/libwebp/dsp/cpu.c',
|
| - '../third_party/externals/libwebp/dsp/dec.c',
|
| - '../third_party/externals/libwebp/dsp/dec_sse2.c',
|
| - '../third_party/externals/libwebp/dsp/enc.c',
|
| - '../third_party/externals/libwebp/dsp/enc_sse2.c',
|
| - '../third_party/externals/libwebp/dsp/lossless.c',
|
| - '../third_party/externals/libwebp/dsp/upsampling.c',
|
| - '../third_party/externals/libwebp/dsp/upsampling_sse2.c',
|
| - '../third_party/externals/libwebp/dsp/yuv.c',
|
| + '../third_party/externals/libwebp/src/dsp/cpu.c',
|
| + '../third_party/externals/libwebp/src/dsp/dec.c',
|
| + '../third_party/externals/libwebp/src/dsp/dec_sse2.c',
|
| + '../third_party/externals/libwebp/src/dsp/enc.c',
|
| + '../third_party/externals/libwebp/src/dsp/enc_sse2.c',
|
| + '../third_party/externals/libwebp/src/dsp/lossless.c',
|
| + '../third_party/externals/libwebp/src/dsp/upsampling.c',
|
| + '../third_party/externals/libwebp/src/dsp/upsampling_sse2.c',
|
| + '../third_party/externals/libwebp/src/dsp/yuv.c',
|
| ],
|
| 'conditions': [
|
| ['skia_os == "android"', {
|
| @@ -63,7 +73,7 @@
|
| '../third_party/externals/libwebp',
|
| ],
|
| 'sources': [
|
| - '../third_party/externals/libwebp/dsp/dec_neon.c',
|
| + '../third_party/externals/libwebp/src/dsp/dec_neon.c',
|
| ],
|
| # behavior similar dsp_neon.c.neon in an Android.mk
|
| 'cflags!': [
|
| @@ -82,22 +92,23 @@
|
| '../third_party/externals/libwebp',
|
| ],
|
| 'sources': [
|
| - '../third_party/externals/libwebp/enc/alpha.c',
|
| - '../third_party/externals/libwebp/enc/analysis.c',
|
| - '../third_party/externals/libwebp/enc/backward_references.c',
|
| - '../third_party/externals/libwebp/enc/config.c',
|
| - '../third_party/externals/libwebp/enc/cost.c',
|
| - '../third_party/externals/libwebp/enc/filter.c',
|
| - '../third_party/externals/libwebp/enc/frame.c',
|
| - '../third_party/externals/libwebp/enc/histogram.c',
|
| - '../third_party/externals/libwebp/enc/iterator.c',
|
| - '../third_party/externals/libwebp/enc/layer.c',
|
| - '../third_party/externals/libwebp/enc/picture.c',
|
| - '../third_party/externals/libwebp/enc/quant.c',
|
| - '../third_party/externals/libwebp/enc/syntax.c',
|
| - '../third_party/externals/libwebp/enc/tree.c',
|
| - '../third_party/externals/libwebp/enc/vp8l.c',
|
| - '../third_party/externals/libwebp/enc/webpenc.c',
|
| + '../third_party/externals/libwebp/src/enc/alpha.c',
|
| + '../third_party/externals/libwebp/src/enc/analysis.c',
|
| + '../third_party/externals/libwebp/src/enc/backward_references.c',
|
| + '../third_party/externals/libwebp/src/enc/config.c',
|
| + '../third_party/externals/libwebp/src/enc/cost.c',
|
| + '../third_party/externals/libwebp/src/enc/filter.c',
|
| + '../third_party/externals/libwebp/src/enc/frame.c',
|
| + '../third_party/externals/libwebp/src/enc/histogram.c',
|
| + '../third_party/externals/libwebp/src/enc/iterator.c',
|
| + '../third_party/externals/libwebp/src/enc/layer.c',
|
| + '../third_party/externals/libwebp/src/enc/picture.c',
|
| + '../third_party/externals/libwebp/src/enc/quant.c',
|
| + '../third_party/externals/libwebp/src/enc/syntax.c',
|
| + '../third_party/externals/libwebp/src/enc/token.c',
|
| + '../third_party/externals/libwebp/src/enc/tree.c',
|
| + '../third_party/externals/libwebp/src/enc/vp8l.c',
|
| + '../third_party/externals/libwebp/src/enc/webpenc.c',
|
| ],
|
| },
|
| {
|
| @@ -107,16 +118,17 @@
|
| '../third_party/externals/libwebp',
|
| ],
|
| 'sources': [
|
| - '../third_party/externals/libwebp/utils/bit_reader.c',
|
| - '../third_party/externals/libwebp/utils/bit_writer.c',
|
| - '../third_party/externals/libwebp/utils/color_cache.c',
|
| - '../third_party/externals/libwebp/utils/filters.c',
|
| - '../third_party/externals/libwebp/utils/huffman.c',
|
| - '../third_party/externals/libwebp/utils/huffman_encode.c',
|
| - '../third_party/externals/libwebp/utils/quant_levels.c',
|
| - '../third_party/externals/libwebp/utils/rescaler.c',
|
| - '../third_party/externals/libwebp/utils/thread.c',
|
| - '../third_party/externals/libwebp/utils/utils.c',
|
| + '../third_party/externals/libwebp/src/utils/bit_reader.c',
|
| + '../third_party/externals/libwebp/src/utils/bit_writer.c',
|
| + '../third_party/externals/libwebp/src/utils/color_cache.c',
|
| + '../third_party/externals/libwebp/src/utils/filters.c',
|
| + '../third_party/externals/libwebp/src/utils/huffman.c',
|
| + '../third_party/externals/libwebp/src/utils/huffman_encode.c',
|
| + '../third_party/externals/libwebp/src/utils/quant_levels.c',
|
| + '../third_party/externals/libwebp/src/utils/quant_levels_dec.c',
|
| + '../third_party/externals/libwebp/src/utils/rescaler.c',
|
| + '../third_party/externals/libwebp/src/utils/thread.c',
|
| + '../third_party/externals/libwebp/src/utils/utils.c',
|
| ],
|
| },
|
| {
|
| @@ -124,6 +136,7 @@
|
| 'type': 'none',
|
| 'dependencies' : [
|
| 'libwebp_dec',
|
| + 'libwebp_demux',
|
| 'libwebp_dsp',
|
| 'libwebp_dsp_neon',
|
| 'libwebp_enc',
|
| @@ -131,7 +144,7 @@
|
| ],
|
| 'direct_dependent_settings': {
|
| 'include_dirs': [
|
| - '../third_party/externals/libwebp',
|
| + '../third_party/externals/libwebp/src',
|
| ],
|
| },
|
| 'conditions': [
|
|
|