--- old/make/modules/java.desktop/lib/Awt2dLibraries.gmk	2020-07-31 10:28:47.892861346 -0700
+++ new/make/modules/java.desktop/lib/Awt2dLibraries.gmk	2020-07-31 10:28:47.608861351 -0700
@@ -432,6 +432,9 @@
 
 ###########################################################################
 
+ifeq ($(USE_EXTERNAL_HARFBUZZ), true)
+  LIBHARFBUZZ_LIBS := $(HARFBUZZ_LIBS)
+else
 HARFBUZZ_CFLAGS := -DHAVE_OT -DHAVE_FALLBACK -DHAVE_UCDN -DHAVE_ROUND
 
 # This is better than adding EXPORT_ALL_SYMBOLS
@@ -508,6 +511,8 @@
 
 TARGETS += $(BUILD_LIBHARFBUZZ)
 
+endif
+
 ###########################################################################
 
 LIBFONTMANAGER_EXTRA_HEADER_DIRS := \
@@ -576,7 +581,11 @@
         $(WIN_AWT_LIB), \
 ))
 
-$(BUILD_LIBFONTMANAGER): $(BUILD_LIBAWT) $(BUILD_LIBHARFBUZZ)
+$(BUILD_LIBFONTMANAGER): $(BUILD_LIBAWT)
+
+ifeq ($(USE_EXTERNAL_HARFBUZZ), false)
+  $(BUILD_LIBFONTMANAGER): $(BUILD_LIBHARFBUZZ)
+endif
 
 ifeq ($(call isTargetOs, macosx), true)
   $(BUILD_LIBFONTMANAGER): $(call FindLib, $(MODULE), awt_lwawt)