diff --git a/DEPS b/DEPS
index e1a9f41..c98471f 100644
--- a/DEPS
+++ b/DEPS
@@ -186,7 +186,7 @@
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling skia
   # and whatever else without interference from each other.
-  'skia_revision': '5491fe7b9035900c5fe0067d9ff9495187262208',
+  'skia_revision': '505fb55cd044326b2f049e673475f49822b4911d',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling test_fonts
   # and whatever else without interference from each other.
diff --git a/skia/BUILD.gn b/skia/BUILD.gn
index f30b9a4..684782f 100644
--- a/skia/BUILD.gn
+++ b/skia/BUILD.gn
@@ -221,14 +221,14 @@
   sources += skia_sksl_default_module_sources
   sources += skia_utils_private
   sources += skia_xps_sources
-  sources += skia_codec_core
   sources += skia_codec_decode_bmp
+  sources += skia_codec_png
+  sources += skia_codec_shared
   sources += skia_encode_srcs
   sources += skia_encode_png_srcs
+  sources += skia_ports_sources
   sources += [
-    "//third_party/skia/src/ports/SkGlobalInitialization_default.cpp",
     "//third_party/skia/src/ports/SkImageGenerator_none.cpp",
-    "//third_party/skia/src/ports/SkOSFile_stdio.cpp",
     "//third_party/skia/src/sfnt/SkOTTable_name.cpp",
     "//third_party/skia/src/sfnt/SkOTUtils.cpp",
 
@@ -284,14 +284,8 @@
 
   if (is_win) {
     # See SK_TYPEFACE_FACTORY_DIRECTWRITE
-    sources += [
-      "//third_party/skia/src/codec/SkEncodedInfo.cpp",
-      "//third_party/skia/src/codec/SkPngCodec.cpp",
-      "//third_party/skia/src/ports/SkFontMgr_win_dw.cpp",
-      "//third_party/skia/src/ports/SkOSFile_win.cpp",
-      "//third_party/skia/src/ports/SkScalerContext_win_dw.cpp",
-      "//third_party/skia/src/ports/SkTypeface_win_dw.cpp",
-    ]
+    sources += skia_ports_windows_fonts_sources
+    sources += skia_ports_windows_sources
   } else {
     sources += [ "//third_party/skia/src/ports/SkOSFile_posix.cpp" ]
   }