Commit 1bd9a310 authored by mtklein's avatar mtklein Committed by Commit bot

Skia roll 0c88d82:a17aac8 with fixed build exclusions.

Apparently it's fatal for GN to try to remove something that doesn't exist,
but not for GYP... the GYP list is way out of date.

SkTaskGroup{.cpp,.h} are not currently listed in utils.gypi,
so there's no need to remove them.

https://skia.googlesource.com/skia/+log/0c88d8233ba3a8baa9b4dd6ef515def6b3749980..a17aac8bd4c755c3a24befc7fd297969c0bb0861

CQ_EXTRA_TRYBOTS=tryserver.blink:linux_blink_rel,linux_blink_dbg

Bots seem to be failing before and after this CL.
NOTRY=true

BUG=

Review URL: https://codereview.chromium.org/537363002

Cr-Commit-Position: refs/heads/master@{#293318}
parent 31fccd7d
......@@ -38,7 +38,7 @@ vars = {
# to update other nacl_*_revision's.
'libvpx_revision': '982d14793a8e42d2fa5e6e5e34bede17b4ba67e3', # r291730
'sfntly_revision': '1bdaae8fc788a5ac8936d68bf24f37d977a13dac',
'skia_revision': '0c88d8233ba3a8baa9b4dd6ef515def6b3749980',
'skia_revision': 'a17aac8bd4c755c3a24befc7fd297969c0bb0861',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling Skia
# and V8 without interference from each other.
......
......@@ -325,10 +325,9 @@ component("skia") {
# Remove unused util files include in utils.gypi
sources -= [
"//third_party/skia/src/utils/SkCondVar.cpp",
"//third_party/skia/src/utils/SkCondVar.h",
"//third_party/skia/src/utils/SkRunnable.h",
"//third_party/skia/src/utils/SkThreadPool.h",
"//third_party/skia/src/utils/SkCondVar.cpp",
"//third_party/skia/include/utils/SkBoundaryPatch.h",
"//third_party/skia/include/utils/SkFrontBufferedStream.h",
......@@ -477,7 +476,7 @@ component("skia") {
"ext/bitmap_platform_device_win.h",
]
} else if (is_mac) {
sources += [
sources += [
"ext/bitmap_platform_device_mac.cc",
"ext/bitmap_platform_device_mac.h",
]
......
......@@ -28,7 +28,7 @@
'sources': [
# this should likely be moved into src/utils in skia
'../third_party/skia/src/core/SkFlate.cpp',
'../third_party/skia/src/ports/SkImageDecoder_empty.cpp',
'../third_party/skia/src/images/SkScaledBitmapSampler.cpp',
'../third_party/skia/src/images/SkScaledBitmapSampler.h',
......@@ -89,12 +89,9 @@
# Exclude all unused files in skia utils.gypi file
'sources!': [
'../third_party/skia/include/utils/SkCondVar.h',
'../third_party/skia/include/utils/SkCountdown.h',
'../third_party/skia/include/utils/SkRunnable.h',
'../third_party/skia/include/utils/SkThreadPool.h',
'../third_party/skia/src/utils/SkCondVar.cpp',
'../third_party/skia/src/utils/SkCountdown.cpp',
'../third_party/skia/src/utils/SkCondVar.h',
'../third_party/skia/src/utils/SkRunnable.h',
'../third_party/skia/include/utils/SkBoundaryPatch.h',
'../third_party/skia/include/utils/SkFrontBufferedStream.h',
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment