diff options
author | scroggo <scroggo@google.com> | 2015-07-08 10:57:22 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-07-08 10:57:22 -0700 |
commit | c1d1dd738e8dda1dd439f8e2b065ec73b5c12b51 (patch) | |
tree | 185881702ff5890365721bc7b52b1d81d69f41a9 /gyp | |
parent | 5f0b0ad5d9c6d3345ccb5ae902a006e85c10e19b (diff) |
Revert of Use the upstream version of libwebp, v0.4.3. (patchset #6 id:70001 of https://codereview.chromium.org/1178013008/)
Reason for revert:
Breaking the build e.g. http://build.chromium.org/p/client.skia/builders/Perf-Mac10.8-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Release/builds/1082/steps/build%20nanobench/logs/stdio
../../../third_party/externals/libwebp/src/utils/./endian_inl.h:51:10: error: use of unknown builtin '__builtin_bswap16' [-Wimplicit-function-declaration]
return __builtin_bswap16(x);
^
1 error generated.
Original issue's description:
> Use the upstream version of libwebp, v0.4.3.
>
> DEPS:
> Update to pull v0.4.3 of libwebp from upstream
>
> gyp/libwebp.gyp:
> Add new files, as referenced by the gyp file used by Chromium.
>
> resource/tests:
> Add regression tests for particular images.
>
> BUG=skia:3442
> BUG=skia:3315
> BUG=skia:3429
>
> Committed: https://skia.googlesource.com/skia/+/3aa0fb4d80c76b559ff4b82d5e569993aea06da1
TBR=djsollen@google.com,jzern@chromium.org,msarett@google.com,emmaleer@google.com,scroggo@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:3442
Review URL: https://codereview.chromium.org/1223583004
Diffstat (limited to 'gyp')
-rw-r--r-- | gyp/libwebp.gyp | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/gyp/libwebp.gyp b/gyp/libwebp.gyp index da3741655a..70fffdd925 100644 --- a/gyp/libwebp.gyp +++ b/gyp/libwebp.gyp @@ -28,6 +28,7 @@ '../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', @@ -56,20 +57,15 @@ '../third_party/externals/libwebp', ], 'sources': [ - '../third_party/externals/libwebp/src/dsp/alpha_processing.c', - '../third_party/externals/libwebp/src/dsp/alpha_processing_sse2.c', '../third_party/externals/libwebp/src/dsp/cpu.c', '../third_party/externals/libwebp/src/dsp/dec.c', - '../third_party/externals/libwebp/src/dsp/dec_clip_tables.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/lossless_sse2.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/externals/libwebp/src/dsp/yuv_sse2.c', ], 'cflags': [ '-w' ], 'xcode_settings': { 'WARNING_CFLAGS': [ '-w' ] }, @@ -92,7 +88,6 @@ '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/lossless_neon.c', '../third_party/externals/libwebp/src/dsp/upsampling_neon.c', ], # behavior similar dsp_neon.c.neon in an Android.mk @@ -121,8 +116,8 @@ '../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/picture_csp.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', @@ -148,7 +143,6 @@ '../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/random.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', @@ -180,7 +174,7 @@ }, ], }, { - # use_system_libwebp == 1 + # use_system_libwep == 1 'targets': [ { 'target_name': 'libwebp', |