summaryrefslogtreecommitdiff
path: root/skia
diff options
context:
space:
mode:
authorcaryclark <caryclark@google.com>2016-05-11 10:52:53 -0700
committerCommit bot <commit-bot@chromium.org>2016-05-11 10:52:53 -0700
commit317354363a60529e486cbf4e8fcb883d34ea989b (patch)
tree9bd95a12ed3de5855ddcee45c58fd34439859ebc /skia
parentf74ad998d2e8d2636fb25e94823946a3b151e34e (diff)
downloadpdfium-317354363a60529e486cbf4e8fcb883d34ea989b.tar.xz
fix skia build
Fix some bit rot with the Skia build; update the gypi to current and switch a deprecated call for the current one. R=tsepez@chromium.org Review-Url: https://codereview.chromium.org/1958263002
Diffstat (limited to 'skia')
-rw-r--r--skia/skia_library.gypi5
1 files changed, 1 insertions, 4 deletions
diff --git a/skia/skia_library.gypi b/skia/skia_library.gypi
index bd29a5a984..dd3d240a0c 100644
--- a/skia/skia_library.gypi
+++ b/skia/skia_library.gypi
@@ -27,9 +27,6 @@
'sources': [
'../third_party/skia/src/lazy/SkDiscardableMemoryPool.cpp',
- '../third_party/skia/src/ports/SkImageDecoder_empty.cpp',
- '../third_party/skia/src/images/SkScaledBitmapSampler.cpp',
-
'../third_party/skia/src/ports/SkFontConfigInterface_direct.cpp',
'../third_party/skia/src/ports/SkFontConfigInterface_direct_factory.cpp',
@@ -39,6 +36,7 @@
'../third_party/skia/src/fonts/SkRemotableFontMgr.cpp',
'../third_party/skia/src/ports/SkRemotableFontMgr_win_dw.cpp',
+ '../third_party/skia/src/ports/SkImageEncoder_none.cpp',
'../third_party/skia/src/ports/SkImageGenerator_none.cpp',
'../third_party/skia/src/ports/SkFontHost_FreeType.cpp',
@@ -57,7 +55,6 @@
'../third_party/skia/src/ports/SkOSFile_stdio.cpp',
'../third_party/skia/src/ports/SkOSFile_win.cpp',
'../third_party/skia/src/ports/SkScalerContext_win_dw.cpp',
- '../third_party/skia/src/ports/SkTime_Unix.cpp',
'../third_party/skia/src/ports/SkTLS_pthread.cpp',
'../third_party/skia/src/ports/SkTLS_win.cpp',
'../third_party/skia/src/ports/SkTypeface_win_dw.cpp',