diff -r 0b471e6f3fce -r 958d65712d3e jdk/make/lib/Awt2dLibraries.gmk
--- a/jdk/make/lib/Awt2dLibraries.gmk	Thu Dec 03 14:01:33 2015 +0530
+++ b/jdk/make/lib/Awt2dLibraries.gmk	Thu Dec 03 11:53:00 2015 -0800
@@ -622,9 +622,8 @@
 ifneq ($(OPENJDK_TARGET_OS), macosx)
   LIBFONTMANAGER_EXCLUDE_FILES += harfbuzz/hb-coretext.cc
 endif
-ifndef OPENJDK
-  LIBFONTMANAGER_EXCLUDE_FILES += harfbuzz/hb-ft.cc
-endif
+# hb-ft.cc is not presently needed, and requires freetype 2.4.2 or later.
+LIBFONTMANAGER_EXCLUDE_FILES += harfbuzz/hb-ft.cc
 
 LIBFONTMANAGER_CFLAGS += $(HARFBUZZ_CFLAGS)