diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-14 15:52:24 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-14 15:52:24 +0000 |
| commit | 6e69310dd0041722cd6eb50f7323f685a5112615 (patch) | |
| tree | 341526996098b1b7ed01870021e3c32829013cc7 /skia/skia.gyp | |
| parent | b18b89f3601ee18ffc02e768dec12febc159e8d2 (diff) | |
| download | chromium_src-6e69310dd0041722cd6eb50f7323f685a5112615.zip chromium_src-6e69310dd0041722cd6eb50f7323f685a5112615.tar.gz chromium_src-6e69310dd0041722cd6eb50f7323f685a5112615.tar.bz2 | |
Revert 173153 because it broke win build with this error:
"SkTileGrid.cpp(77): error C3861: 'alloca': identifier not found"
> Roll Skia DEPS to r6819 & update skia.gyp
>
> control: https://codereview.chromium.org/11564035/
> Review URL: https://codereview.chromium.org/11566030
TBR=robertphillips@google.com
Review URL: https://codereview.chromium.org/11565039
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@173158 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia/skia.gyp')
| -rw-r--r-- | skia/skia.gyp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/skia/skia.gyp b/skia/skia.gyp index 0bffca8..01cbe3f 100644 --- a/skia/skia.gyp +++ b/skia/skia.gyp @@ -41,6 +41,7 @@ '../third_party/skia/src/images/bmpdecoderhelper.cpp', '../third_party/skia/src/images/bmpdecoderhelper.h', #'../third_party/skia/src/images/SkFDStream.cpp', + #'../third_party/skia/src/images/SkFlipPixelRef.cpp', '../third_party/skia/src/images/SkImageDecoder.cpp', '../third_party/skia/src/images/SkImageDecoder_Factory.cpp', #'../third_party/skia/src/images/SkImageDecoder_fpdfemb.cpp', @@ -141,6 +142,7 @@ '../third_party/skia/include/ports/SkTypeface_win.h', + '../third_party/skia/include/images/SkFlipPixelRef.h', '../third_party/skia/include/images/SkImageDecoder.h', '../third_party/skia/include/images/SkImageEncoder.h', '../third_party/skia/include/images/SkImageRef.h', |