aboutsummaryrefslogtreecommitdiff
path: root/DEPS
diff options
context:
space:
mode:
authorscroggo <scroggo@google.com>2015-07-08 10:57:22 -0700
committerCommit bot <commit-bot@chromium.org>2015-07-08 10:57:22 -0700
commitc1d1dd738e8dda1dd439f8e2b065ec73b5c12b51 (patch)
tree185881702ff5890365721bc7b52b1d81d69f41a9 /DEPS
parent5f0b0ad5d9c6d3345ccb5ae902a006e85c10e19b (diff)
downloadskia-c1d1dd738e8dda1dd439f8e2b065ec73b5c12b51.tar.gz
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 'DEPS')
-rw-r--r--DEPS2
1 files changed, 1 insertions, 1 deletions
diff --git a/DEPS b/DEPS
index bb44306e26..318cf4e3c8 100644
--- a/DEPS
+++ b/DEPS
@@ -14,7 +14,7 @@ deps = {
"third_party/externals/harfbuzz": "https://skia.googlesource.com/third_party/harfbuzz.git@0.9.35",
"third_party/externals/jsoncpp" : "https://chromium.googlesource.com/external/jsoncpp/jsoncpp.git@1afff032c83e26ddf7f2776e8b43de5ad666c1fa",
"third_party/externals/libjpeg" : "https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git@034e9a9747e0983bc19808ea70e469bc8342081f",
- "third_party/externals/libwebp" : "https://chromium.googlesource.com/webm/libwebp.git@v0.4.3",
+ "third_party/externals/libwebp" : "https://chromium.googlesource.com/webm/libwebp.git@3fe91635df8734b23f3c1b9d1f0c4fa8cfaf4e39",
"third_party/externals/nanomsg" : "https://skia.googlesource.com/third_party/nanomsg.git@0.4-beta",
"third_party/externals/zlib" : "https://chromium.googlesource.com/chromium/src/third_party/zlib@4ba7cdd0e7bf49d671645264f839838fc56e1492",
# NOTE: If we update libpng, we may need to update the generated file at third_party/libpng/pnglibconf.h