diff options
| author | mtklein <mtklein@chromium.org> | 2014-09-04 10:29:11 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-09-04 17:50:43 +0000 |
| commit | 1bd9a310d493c5a8aab0c2d7d5bf62050cd06f1f (patch) | |
| tree | b4abcdca4010ff7425fecd785d241ed39150520b /skia/skia_library.gypi | |
| parent | 31fccd7d06810805b1110884c0ece1484c73256b (diff) | |
| download | chromium_src-1bd9a310d493c5a8aab0c2d7d5bf62050cd06f1f.zip chromium_src-1bd9a310d493c5a8aab0c2d7d5bf62050cd06f1f.tar.gz chromium_src-1bd9a310d493c5a8aab0c2d7d5bf62050cd06f1f.tar.bz2 | |
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}
Diffstat (limited to 'skia/skia_library.gypi')
| -rw-r--r-- | skia/skia_library.gypi | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/skia/skia_library.gypi b/skia/skia_library.gypi index aed4f611..d178319 100644 --- a/skia/skia_library.gypi +++ b/skia/skia_library.gypi @@ -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', |