--- old/make/copy/Copy-java.desktop.gmk	2018-03-09 13:45:59.864545854 -0800
+++ new/make/copy/Copy-java.desktop.gmk	2018-03-09 13:45:59.676545857 -0800
@@ -29,52 +29,6 @@
 
 ################################################################################
 
-ifneq ($(FREETYPE_BUNDLE_LIB_PATH), )
-  # We need to bundle the freetype library, so it will be available at runtime
-  # as well as link time.
-  #
-  # NB: Default freetype build system uses -h linker option and
-  # result .so contains hardcoded library name that is later
-  # used for adding dependencies to other objects
-  # (e.g. libfontmanager.so).
-  #
-  # It is not obvious how to extract that hardcoded name (libfreetype.so.6)
-  # without overcomplicating logic here.
-  # To workaround this we hardcode .6 suffix for now.
-  #
-  # Note that .so.6 library will not be found by System.loadLibrary()
-  # but fortunately we need to load FreeType library explicitly
-  # on windows only
-  #
-  #TODO: rework this to avoid hardcoding library name in the makefile
-  #
-  ifneq ($(filter $(OPENJDK_TARGET_OS), linux solaris), )
-    FREETYPE_TARGET_LIB := $(LIB_DST_DIR)/$(call SHARED_LIBRARY,freetype).6
-  else
-    FREETYPE_TARGET_LIB := $(LIB_DST_DIR)/$(call SHARED_LIBRARY,freetype)
-  endif
-
-  # We can't use $(install-file) in this rule because it preserves symbolic links and
-  # libfreetype.so is usually a symbolic link to something like libfreetype.so.6 on Unix.
-  $(FREETYPE_TARGET_LIB): $(FREETYPE_BUNDLE_LIB_PATH)/$(call SHARED_LIBRARY,freetype)
-	$(MKDIR) -p $(@D)
-	$(CP) $< $@
-        ifeq ($(OPENJDK_BUILD_OS), windows)
-	  $(CHMOD) +rx $@
-        endif
-
-  TARGETS += $(FREETYPE_TARGET_LIB)
-
-  $(eval $(call SetupCopyFiles, COPY_FREETYPE_LICENSE, \
-      FILES := $(FREETYPE_LICENSE), \
-      DEST := $(LEGAL_DST_DIR), \
-  ))
-
-  TARGETS += $(COPY_FREETYPE_LICENSE)
-endif
-
-################################################################################
-
 $(CONF_DST_DIR)/sound.properties: $(TOPDIR)/src/java.desktop/share/conf/sound.properties
 	$(call install-file)