diff --git a/BUILD.gn b/BUILD.gn
index f44a7b384a5b..c41552795c01 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -3663,76 +3663,21 @@ skiasharp_build("HarfBuzzSharp") {
   ]
 
   defines = [
-    "HAVE_ATEXIT",
-    "HAVE_CXX11",
-    "HAVE_GETPAGESIZE",
-    "HAVE_ISATTY",
-    "HAVE_MEMORY_H",
-    "HAVE_MMAP",
-    "HAVE_MPROTECT",
-    "HAVE_PTHREAD",
-    "HAVE_SYS_MMAN_H",
-    "HAVE_SYS_STAT_H",
-    "HAVE_SYS_TYPES_H",
-    "HAVE_SYSCONF",
-    "HAVE_UNISTD_H"
+    #"HAVE_FREETYPE",
+    #"HAVE_ICU",
+    #"HAVE_ICU_BUILTIN",
+    "HAVE_OT",
+    "HAVE_CONFIG_OVERRIDE_H",
+    "HB_NO_FALLBACK_SHAPE",
+    # "HB_NO_WIN1256",
+  ]
+
+  include_dirs = [
+    "third_party/harfbuzz"
   ]
 
   _src = "third_party/externals/harfbuzz/src"
   sources = [
-    "$_src/hb-aat-layout.cc",
-    "$_src/hb-aat-map.cc",
-    "$_src/hb-blob.cc",
-    "$_src/hb-buffer-serialize.cc",
-    "$_src/hb-buffer.cc",
-    "$_src/hb-common.cc",
-    "$_src/hb-draw.cc",
-    "$_src/hb-face.cc",
-    "$_src/hb-fallback-shape.cc",
-    "$_src/hb-font.cc",
-    "$_src/hb-map.cc",
-    "$_src/hb-number.cc",
-    "$_src/hb-ot-cff1-table.cc",
-    "$_src/hb-ot-cff2-table.cc",
-    "$_src/hb-ot-color.cc",
-    "$_src/hb-ot-face.cc",
-    "$_src/hb-ot-font.cc",
-    "$_src/hb-ot-layout.cc",
-    "$_src/hb-ot-map.cc",
-    "$_src/hb-ot-math.cc",
-    "$_src/hb-ot-meta.cc",
-    "$_src/hb-ot-metrics.cc",
-    "$_src/hb-ot-name.cc",
-    "$_src/hb-ot-shape-complex-arabic.cc",
-    "$_src/hb-ot-shape-complex-default.cc",
-    "$_src/hb-ot-shape-complex-hangul.cc",
-    "$_src/hb-ot-shape-complex-hebrew.cc",
-    "$_src/hb-ot-shape-complex-indic-table.cc",
-    "$_src/hb-ot-shape-complex-indic.cc",
-    "$_src/hb-ot-shape-complex-khmer.cc",
-    "$_src/hb-ot-shape-complex-myanmar.cc",
-    "$_src/hb-ot-shape-complex-syllabic.cc",
-    "$_src/hb-ot-shape-complex-thai.cc",
-    "$_src/hb-ot-shape-complex-use.cc",
-    "$_src/hb-ot-shape-complex-vowel-constraints.cc",
-    "$_src/hb-ot-shape-fallback.cc",
-    "$_src/hb-ot-shape-normalize.cc",
-    "$_src/hb-ot-shape.cc",
-    "$_src/hb-ot-tag.cc",
-    "$_src/hb-ot-var.cc",
-    "$_src/hb-set.cc",
-    "$_src/hb-shape-plan.cc",
-    "$_src/hb-shape.cc",
-    "$_src/hb-shaper.cc",
-    "$_src/hb-static.cc",
-    "$_src/hb-style.cc",
-    "$_src/hb-subset-cff-common.cc",
-    "$_src/hb-subset-cff1.cc",
-    "$_src/hb-subset-cff2.cc",
-    "$_src/hb-subset-input.cc",
-    "$_src/hb-subset-plan.cc",
-    "$_src/hb-subset.cc",
-    "$_src/hb-ucd.cc",
-    "$_src/hb-unicode.cc",
+    "$_src/harfbuzz-subset.cc",
   ]
 }
diff --git a/DEPS b/DEPS
index 8cfafb350a18..2e8bb2af890e 100644
--- a/DEPS
+++ b/DEPS
@@ -33,7 +33,7 @@ deps = {
   "third_party/externals/emsdk"                  : "https://skia.googlesource.com/external/github.com/emscripten-core/emsdk.git@4a48a752e6a8bef6f222622f2b4926d5eb3bdeb3",
   "third_party/externals/expat"                  : "https://chromium.googlesource.com/external/github.com/libexpat/libexpat.git@441f98d02deafd9b090aea568282b28f66a50e36",
   "third_party/externals/freetype"               : "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git@d857bd535b6c7e877f262a9b61ed21ee11b35dab",
-  "third_party/externals/harfbuzz"               : "https://github.com/harfbuzz/harfbuzz.git@63e15eac4f443fa53565d1e4fb9611cdd7814f28",
+  "third_party/externals/harfbuzz"               : "https://github.com/harfbuzz/harfbuzz.git@4584bcdc326564829d3cee3572386c90e4fd1974",
   "third_party/externals/highway"                : "https://chromium.googlesource.com/external/github.com/google/highway.git@424360251cdcfc314cfc528f53c872ecd63af0f0",
   "third_party/externals/icu"                    : "https://chromium.googlesource.com/chromium/deps/icu.git@a0718d4f121727e30b8d52c7a189ebf5ab52421f",
   "third_party/externals/imgui"                  : "https://skia.googlesource.com/external/github.com/ocornut/imgui.git@55d35d8387c15bf0cfd71861df67af8cfbda7456",