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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: gyp/libwebp.gyp

Issue 1178013008: Use the upstream version of libwebp, v0.4.3. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Fixes for SkWebpImageDecoder and SkWebpCodec. 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 | « DEPS ('k') | src/codec/SkWebpCodec.cpp » ('j') | src/codec/SkWebpCodec.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gyp/libwebp.gyp
diff --git a/gyp/libwebp.gyp b/gyp/libwebp.gyp
index 70fffdd925251c8c8fc7a2338c8c5e2898326850..366ef931bcedb03d7792e5ee5bb68e2021f078f4 100644
--- a/gyp/libwebp.gyp
+++ b/gyp/libwebp.gyp
@@ -20,20 +20,19 @@
'target_name': 'libwebp_dec',
'type': 'static_library',
'include_dirs': [
- '../third_party/externals/libwebp',
+ '../third_party/libwebp',
],
'sources': [
- '../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',
+ '../third_party/libwebp/dec/alpha.c',
+ '../third_party/libwebp/dec/buffer.c',
+ '../third_party/libwebp/dec/frame.c',
+ '../third_party/libwebp/dec/idec.c',
+ '../third_party/libwebp/dec/io.c',
+ '../third_party/libwebp/dec/quant.c',
+ '../third_party/libwebp/dec/tree.c',
+ '../third_party/libwebp/dec/vp8.c',
+ '../third_party/libwebp/dec/vp8l.c',
+ '../third_party/libwebp/dec/webp.c',
],
'cflags': [ '-w' ],
'xcode_settings': { 'WARNING_CFLAGS': [ '-w' ] },
@@ -42,10 +41,10 @@
'target_name': 'libwebp_demux',
'type': 'static_library',
'include_dirs': [
- '../third_party/externals/libwebp',
+ '../third_party/libwebp',
],
'sources': [
- '../third_party/externals/libwebp/src/demux/demux.c',
+ '../third_party/libwebp/demux/demux.c',
],
'cflags': [ '-w' ],
'xcode_settings': { 'WARNING_CFLAGS': [ '-w' ] },
@@ -54,18 +53,23 @@
'target_name': 'libwebp_dsp',
'type': 'static_library',
'include_dirs': [
- '../third_party/externals/libwebp',
+ '../third_party/libwebp',
],
'sources': [
- '../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',
+ '../third_party/libwebp/dsp/alpha_processing.c',
+ '../third_party/libwebp/dsp/alpha_processing_sse2.c',
+ '../third_party/libwebp/dsp/cpu.c',
+ '../third_party/libwebp/dsp/dec.c',
+ '../third_party/libwebp/dsp/dec_clip_tables.c',
+ '../third_party/libwebp/dsp/dec_sse2.c',
+ '../third_party/libwebp/dsp/enc.c',
+ '../third_party/libwebp/dsp/enc_sse2.c',
+ '../third_party/libwebp/dsp/lossless.c',
+ '../third_party/libwebp/dsp/lossless_sse2.c',
+ '../third_party/libwebp/dsp/upsampling.c',
+ '../third_party/libwebp/dsp/upsampling_sse2.c',
+ '../third_party/libwebp/dsp/yuv.c',
+ '../third_party/libwebp/dsp/yuv_sse2.c',
],
'cflags': [ '-w' ],
'xcode_settings': { 'WARNING_CFLAGS': [ '-w' ] },
@@ -83,12 +87,12 @@
['arm_version >= 7', {
'type': 'static_library',
'include_dirs': [
- '../third_party/externals/libwebp',
+ '../third_party/libwebp',
],
'sources': [
- '../third_party/externals/libwebp/src/dsp/dec_neon.c',
- '../third_party/externals/libwebp/src/dsp/enc_neon.c',
- '../third_party/externals/libwebp/src/dsp/upsampling_neon.c',
+ '../third_party/libwebp/dsp/dec_neon.c',
+ '../third_party/libwebp/dsp/enc_neon.c',
+ '../third_party/libwebp/dsp/upsampling_neon.c',
],
# behavior similar dsp_neon.c.neon in an Android.mk
'cflags!': [
@@ -104,26 +108,26 @@
'target_name': 'libwebp_enc',
'type': 'static_library',
'include_dirs': [
- '../third_party/externals/libwebp',
+ '../third_party/libwebp',
],
'sources': [
- '../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',
+ '../third_party/libwebp/enc/alpha.c',
+ '../third_party/libwebp/enc/analysis.c',
+ '../third_party/libwebp/enc/backward_references.c',
+ '../third_party/libwebp/enc/config.c',
+ '../third_party/libwebp/enc/cost.c',
+ '../third_party/libwebp/enc/filter.c',
+ '../third_party/libwebp/enc/frame.c',
+ '../third_party/libwebp/enc/histogram.c',
+ '../third_party/libwebp/enc/iterator.c',
+ '../third_party/libwebp/enc/picture.c',
+ '../third_party/libwebp/enc/picture_csp.c',
+ '../third_party/libwebp/enc/quant.c',
+ '../third_party/libwebp/enc/syntax.c',
+ '../third_party/libwebp/enc/token.c',
+ '../third_party/libwebp/enc/tree.c',
+ '../third_party/libwebp/enc/vp8l.c',
+ '../third_party/libwebp/enc/webpenc.c',
],
'cflags': [ '-w' ],
'xcode_settings': { 'WARNING_CFLAGS': [ '-w' ] },
@@ -132,20 +136,21 @@
'target_name': 'libwebp_utils',
'type': 'static_library',
'include_dirs': [
- '../third_party/externals/libwebp',
+ '../third_party/libwebp',
],
'sources': [
- '../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',
+ '../third_party/libwebp/utils/bit_reader.c',
+ '../third_party/libwebp/utils/bit_writer.c',
+ '../third_party/libwebp/utils/color_cache.c',
+ '../third_party/libwebp/utils/filters.c',
+ '../third_party/libwebp/utils/huffman.c',
+ '../third_party/libwebp/utils/huffman_encode.c',
+ '../third_party/libwebp/utils/quant_levels.c',
+ '../third_party/libwebp/utils/quant_levels_dec.c',
+ '../third_party/libwebp/utils/random.c',
+ '../third_party/libwebp/utils/rescaler.c',
+ '../third_party/libwebp/utils/thread.c',
+ '../third_party/libwebp/utils/utils.c',
],
'cflags': [ '-w' ],
'xcode_settings': { 'WARNING_CFLAGS': [ '-w' ] },
@@ -163,7 +168,7 @@
],
'direct_dependent_settings': {
'include_dirs': [
- '../third_party/externals/libwebp/src',
+ '../third_party/libwebp',
],
'cflags': [ '-w' ],
'xcode_settings': { 'WARNING_CFLAGS': [ '-w' ] },
@@ -174,7 +179,7 @@
},
],
}, {
- # use_system_libwep == 1
+ # use_system_libwebp == 1
'targets': [
{
'target_name': 'libwebp',
« no previous file with comments | « DEPS ('k') | src/codec/SkWebpCodec.cpp » ('j') | src/codec/SkWebpCodec.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698