diff options
| author | mtklein@google.com <mtklein@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-27 01:20:36 +0000 |
|---|---|---|
| committer | mtklein@google.com <mtklein@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-27 01:20:36 +0000 |
| commit | 3ef98d75e79302a2b5e217f15978d53f64668e1b (patch) | |
| tree | 7036da4af01946f4dfaeda90dd57ec2bbca342ad /skia | |
| parent | 744e079897d430c91b18352c8e200bbeeadffe8b (diff) | |
| download | chromium_src-3ef98d75e79302a2b5e217f15978d53f64668e1b.zip chromium_src-3ef98d75e79302a2b5e217f15978d53f64668e1b.tar.gz chromium_src-3ef98d75e79302a2b5e217f15978d53f64668e1b.tar.bz2 | |
All platforms need to build SkPaintOptionsAndroid at Skia head now.
This is to fix a broken build after 24075010, which adds an unconditional dependency on SkPaintOptionsAndroid::unflatten.
BUG=
Review URL: https://codereview.chromium.org/24776002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@225628 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia')
| -rw-r--r-- | skia/skia_library.gypi | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/skia/skia_library.gypi b/skia/skia_library.gypi index 2ed1854..5c62a45 100644 --- a/skia/skia_library.gypi +++ b/skia/skia_library.gypi @@ -67,9 +67,6 @@ 'sources': [ # this should likely be moved into src/utils in skia '../third_party/skia/src/core/SkFlate.cpp', - # We don't want to add this to Skia's core.gypi since it is - # Android only. Include it here and remove it for everyone - # but Android later. '../third_party/skia/src/core/SkPaintOptionsAndroid.cpp', '../third_party/skia/src/ports/SkImageDecoder_empty.cpp', @@ -235,11 +232,6 @@ }, }], - [ 'OS != "android"', { - 'sources!': [ - '../third_party/skia/src/core/SkPaintOptionsAndroid.cpp', - ], - }], [ 'OS != "ios"', { 'dependencies': [ '../third_party/WebKit/public/blink_skia_config.gyp:blink_skia_config', |