8251367: [windows] harfbuzz.dll not found causes failure to load sun.font.SunFontManager

Reviewed-by: serb

make/modules/java.desktop/lib/Awt2dLibraries.gmk

@@ -456,10 +456,10 @@ else
     HARFBUZZ_CFLAGS += -DHAVE_CORETEXT
   endif
   ifeq ($(call isTargetOs, macosx), false)
-    LIBHARFBUZZ_EXCLUDE_FILES += harfbuzz/hb-coretext.cc
+    LIBHARFBUZZ_EXCLUDE_FILES += libharfbuzz/hb-coretext.cc
   endif
   # hb-ft.cc is not presently needed, and requires freetype 2.4.2 or later.
-  LIBHARFBUZZ_EXCLUDE_FILES += harfbuzz/hb-ft.cc
+  LIBHARFBUZZ_EXCLUDE_FILES += libharfbuzz/hb-ft.cc
 
   LIBHARFBUZZ_CFLAGS += $(HARFBUZZ_CFLAGS)
 

src/java.desktop/share/classes/sun/font/FontManagerNativeLibrary.java

@@ -53,6 +53,8 @@ public class FontManagerNativeLibrary {
                       NB: consider moving freetype wrapper part to separate
                           shared library in order to avoid dependency. */
                    System.loadLibrary("freetype");
+                   /* Same for harfbuzz */
+                   System.loadLibrary("harfbuzz");
                }
                System.loadLibrary("fontmanager");