aboutsummaryrefslogtreecommitdiffhomepage
path: root/DEPS
diff options
context:
space:
mode:
authorGravatar msarett <msarett@google.com>2015-11-23 07:25:53 -0800
committerGravatar Commit bot <commit-bot@chromium.org>2015-11-23 07:25:53 -0800
commit4b9596109a32ec61ef9ffbbf03684e9f99c3cbf7 (patch)
tree814cae69445b7c60b92fd77f22a83ab75c76bab8 /DEPS
parent3389e00136188800b98ca69488c0418c374fd78b (diff)
Revert of Switch Skia's libjpeg-turbo to 1.4.2 (patchset #2 id:160001 of https://codereview.chromium.org/1469553002/ )
Reason for revert: Breaking jpeg decodes everywhere. I need to look into this. Original issue's description: > Switch Skia's libjpeg-turbo to 1.4.2 > > The Android security team wants Android to be on the latest version > of libjpeg-turbo, so Skia should test on this version as well. > > This shouldn't affect Gold. > > I wouldn't be surprised if this causes a few ASAN/valgrind issues > that we need to fix. > > BUG=skia: > > Committed: https://skia.googlesource.com/skia/+/8e8eda9d4d2e6e65e3339eaaaf8144a4ef6c721c TBR=scroggo@google.com,djsollen@google.com NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=skia: Review URL: https://codereview.chromium.org/1468073002
Diffstat (limited to 'DEPS')
-rw-r--r--DEPS2
1 files changed, 1 insertions, 1 deletions
diff --git a/DEPS b/DEPS
index 0644924478..e4dc54cf9e 100644
--- a/DEPS
+++ b/DEPS
@@ -22,7 +22,7 @@ deps = {
"third_party/externals/libpng" : "https://skia.googlesource.com/third_party/libpng.git@070a616b8275277e18ef8ee91e2ca23f7bdc67d5",
"third_party/externals/giflib" : "https://android.googlesource.com/platform/external/giflib.git@ab10e256df4f684260ca239905b1cec727181f6c",
- "third_party/externals/libjpeg-turbo" : "https://skia.googlesource.com/third_party/libjpeg-turbo.git@1.4.2",
+ "third_party/externals/libjpeg-turbo" : "https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git@631e2dd119d49794e3572b6ca3f16ee39d59f372",
# libjpeg-turbo depends on yasm to compile .asm files
"third_party/externals/yasm/source/patched-yasm/" : "https://chromium.googlesource.com/chromium/deps/yasm/patched-yasm.git@4671120cd8558ce62ee8672ebf3eb6f5216f909b",
"third_party/externals/yasm/binaries" : "https://chromium.googlesource.com/chromium/deps/yasm/binaries.git@52f9b3f4b0aa06da24ef8b123058bb61ee468881",