From e83c8ebbc45eb5027795b5306942f686be413053 Mon Sep 17 00:00:00 2001 From: benjaminwagner Date: Tue, 19 Jan 2016 09:50:17 -0800 Subject: [PATCH] Revert of Update libwebp to version 0.5.0 (patchset #2 id:20001 of https://codereview.chromium.org/1601253003/ ) Reason for revert: Seems to be causing bots to fail: https://build.chromium.org/p/client.skia.compile/builders/Build-Ubuntu-GCC-Arm7-Release-Android_NoNeon/builds/4032 https://build.chromium.org/p/client.skia.android/builders/Perf-Android-GCC-Nexus5-CPU-NEON-Arm7-Release/builds/3239 https://build.chromium.org/p/client.skia.android/builders/Perf-Android-GCC-Nexus5-GPU-Adreno330-Arm7-Release/builds/1887 https://build.chromium.org/p/client.skia.fyi/builders/Perf-Android-GCC-Nexus5-GPU-Adreno330-Arm7-Release-Appurify/builds/2075 https://build.chromium.org/p/client.skia.android/builders/Test-Android-GCC-Nexus5-CPU-NEON-Arm7-Debug/builds/2136 https://build.chromium.org/p/client.skia.android/builders/Test-Android-GCC-Nexus5-CPU-NEON-Arm7-Release/builds/3850 https://build.chromium.org/p/client.skia.android/builders/Test-Android-GCC-Nexus5-GPU-Adreno330-Arm7-Debug/builds/2078 https://build.chromium.org/p/client.skia.android/builders/Test-Android-GCC-Nexus5-GPU-Adreno330-Arm7-Release/builds/2000 https://build.chromium.org/p/client.skia.compile/builders/Build-Ubuntu-GCC-Arm7-Debug-Android_NoNeon/builds/4098 Original issue's description: > Update libwebp to version 0.5.0 > > This is the version used by Android. > GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1601253003 > > Committed: https://skia.googlesource.com/skia/+/fe35455210294c3d9de9d0d9534743acfade523d TBR=msarett@google.com,scroggo@google.com # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Review URL: https://codereview.chromium.org/1601083004 --- DEPS | 3 ++- gyp/libwebp.gyp | 2 -- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/DEPS b/DEPS index 07d76ae..e40496a 100644 --- a/DEPS +++ b/DEPS @@ -14,7 +14,8 @@ deps = { "third_party/externals/gyp" : "https://chromium.googlesource.com/external/gyp.git@08429da7955a98ef764fafa223dd7de73f654b2d", "third_party/externals/harfbuzz": "https://skia.googlesource.com/third_party/harfbuzz.git@0.9.35", "third_party/externals/jsoncpp" : "https://chromium.googlesource.com/external/github.com/open-source-parsers/jsoncpp.git@1.0.0", - "third_party/externals/libwebp" : "https://chromium.googlesource.com/webm/libwebp.git@v0.5.0", + # Slightly ahead of v 0.4.3, to include the fix for https://bug.skia.org/4038 + "third_party/externals/libwebp" : "https://chromium.googlesource.com/webm/libwebp.git@5ff0079ece626f122bfb8e33a5f92b5a68484176", "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@c4e33043fb071b6ea0a153845da625d7ed633d3d", # NOTE: If we update libpng, we may need to update the generated file at third_party/libpng/pnglibconf.h diff --git a/gyp/libwebp.gyp b/gyp/libwebp.gyp index 99cd8b0..cff74f6 100644 --- a/gyp/libwebp.gyp +++ b/gyp/libwebp.gyp @@ -87,8 +87,6 @@ '../third_party/externals/libwebp/src/dsp/rescaler.c', '../third_party/externals/libwebp/src/dsp/rescaler_mips32.c', '../third_party/externals/libwebp/src/dsp/rescaler_mips_dsp_r2.c', - '../third_party/externals/libwebp/src/dsp/rescaler_neon.c', - '../third_party/externals/libwebp/src/dsp/rescaler_sse2.c', '../third_party/externals/libwebp/src/dsp/upsampling.c', '../third_party/externals/libwebp/src/dsp/upsampling_mips_dsp_r2.c', '../third_party/externals/libwebp/src/dsp/upsampling_sse2.c', -- 2.7.4