diff --git a/skia/BUILD.gn b/skia/BUILD.gn
index ed71bbd..e4fa164 100644
--- a/skia/BUILD.gn
+++ b/skia/BUILD.gn
@@ -317,8 +317,9 @@
   sources += gypi_skia_gpu.skgpu_sources
   sources += gypi_skia_gpu.skgpu_null_gl_sources
 
-  # Remove unused util files include in utils.gypi
+  # Remove various unused files.
   sources -= [
+    # utils:
     "//third_party/skia/include/utils/SkBoundaryPatch.h",
     "//third_party/skia/include/utils/SkCamera.h",
     "//third_party/skia/include/utils/SkCanvasStateUtils.h",
@@ -351,15 +352,19 @@
     "//third_party/skia/src/utils/SkMD5.h",
     "//third_party/skia/src/utils/SkMeshUtils.cpp",
     "//third_party/skia/src/utils/SkNinePatch.cpp",
-    "//third_party/skia/src/utils/SkOSFile.cpp",
     "//third_party/skia/src/utils/SkParsePath.cpp",
     "//third_party/skia/src/utils/SkSHA1.cpp",
     "//third_party/skia/src/utils/SkSHA1.h",
     "//third_party/skia/src/utils/SkTFitsIn.h",
 
-    #testing
+    # fonts:
+    "//third_party/skia/src/fonts/SkFontMgr_fontconfig.cpp",
     "//third_party/skia/src/fonts/SkGScalerContext.cpp",
     "//third_party/skia/src/fonts/SkGScalerContext.h",
+
+    # ports:
+    "//third_party/skia/src/ports/SkFontConfigInterface_direct.cpp",
+    "//third_party/skia/src/ports/SkFontHost_fontconfig.cpp",
   ]
 
   if (is_ios || is_mac || is_android) {
@@ -453,11 +458,12 @@
     sources -= [ "//third_party/skia/src/ports/SkFontHost_mac.cpp" ]
   }
 
-  if (!is_linux) {
-    sources -= [
-      "//third_party/skia/src/fonts/SkFontMgr_fontconfig.cpp",
-      "//third_party/skia/src/ports/SkFontConfigInterface_direct.cpp",
-      "//third_party/skia/src/ports/SkFontHost_fontconfig.cpp",
+  # On "Linux" (i.e., not Android), we use our a custom SkFontMgr.
+  # TODO(vtl): We should probably do the same on Android.
+  if (is_linux) {
+    sources += [
+      "//third_party/skia/src/ports/SkFontMgr_custom.cpp",
+      "ports/font_mgr_factory.cc",
     ]
   }
 
@@ -508,10 +514,7 @@
   ]
 
   if (is_linux) {
-    configs += [
-      "//build/config/linux:fontconfig",
-      "//build/config/linux:freetype2",
-    ]
+    configs += [ "//build/config/linux:freetype2" ]
     deps += [ "//third_party/icu:icuuc" ]
   }
 
diff --git a/skia/ports/font_mgr_factory.cc b/skia/ports/font_mgr_factory.cc
new file mode 100644
index 0000000..781b7ab
--- /dev/null
+++ b/skia/ports/font_mgr_factory.cc
@@ -0,0 +1,32 @@
+// Copyright 2015 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// This provides a minimal factory for |SkFontMgr| (with no fonts available from
+// the system). It uses |SkFontMgr_New_Custom_Embedded()| from
+// third_party/skia/src/ports/SkFontMgr_custom.cpp.
+//
+// TODO(vtl): We should really have our own, even more minimal |SkFontMgr|
+// implementation. SkFontMgr_custom.cpp includes the ability to gets fonts from
+// disk (or find them from a directory), which we don't want/need, and
+// necessitates bringing in third_party/skia/src/utils/SkOSFile.cpp.
+
+#include "third_party/skia/include/ports/SkFontMgr.h"
+
+// These are actually declared in
+// third_party/skia/src/ports/SkFontMgr_custom.cpp (and not in any header). So
+// we have to (partially) repeat the declarations.
+struct SkEmbeddedResource;
+struct SkEmbeddedResourceHeader {
+  const SkEmbeddedResource* entries;
+  int count;
+};
+SkFontMgr* SkFontMgr_New_Custom_Embedded(
+  const SkEmbeddedResourceHeader* header);
+
+// Static factory function declared in SkFontMgr.h.
+// static
+SkFontMgr* SkFontMgr::Factory() {
+  static const SkEmbeddedResourceHeader kNoEmbeddedFonts = {nullptr, 0};
+  return SkFontMgr_New_Custom_Embedded(&kNoEmbeddedFonts);
+}