--- old/make/Images.gmk	2015-05-22 04:59:32.147100834 -0700
+++ new/make/Images.gmk	2015-05-22 04:59:32.075100375 -0700
@@ -27,8 +27,6 @@
 
 include $(SPEC)
 include MakeBase.gmk
-include JavaCompilation.gmk
-include SetupJavaCompilers.gmk
 
 TOOL_TARGETS :=
 JDK_TARGETS :=
@@ -502,35 +500,12 @@
 ################################################################################
 # ct.sym
 
-CT_DATA_DESCRIPTION ?= $(TOPDIR)/make/data/symbols/symbols
+$(eval $(call SetupCopyFiles, COPY_CTSYM, \
+    FILES := $(SUPPORT_OUTPUTDIR)/symbols/ct.sym, \
+    DEST := $(JDK_IMAGE_DIR)/lib, \
+))
 
-$(eval $(call MakeDir, $(BUILDTOOLS_OUTPUTDIR)/create_symbols))
-
-$(eval $(call SetupJavaCompilation,COMPILE_CREATE_SYMBOLS,$(BUILD_INTERIM_LANGTOOLS) \
-    SETUP := BOOT_JAVAC, \
-    DISABLE_SJAVAC := true, \
-    ADD_JAVAC_FLAGS := -Xbootclasspath/p:"$(INTERIM_LANGTOOLS_JAR)", \
-    SRC := $(TOPDIR)/make/tools, \
-    INCLUDES := symbolgenerator, \
-    BIN := $(BUILDTOOLS_OUTPUTDIR)/create_symbols))
-
-$(IMAGES_OUTPUTDIR)/symbols/_the.symbols: $(COMPILE_CREATE_SYMBOLS)
-	$(RM) -r $(IMAGES_OUTPUTDIR)/symbols/ct.sym
-	$(MKDIR) -p $(IMAGES_OUTPUTDIR)/symbols/ct.sym
-	$(ECHO) Creating ct.sym classes
-	$(JAVA) -Xbootclasspath/p:"$(INTERIM_LANGTOOLS_JAR)" -classpath $(BUILDTOOLS_OUTPUTDIR)/create_symbols symbolgenerator.CreateSymbols \
-	    build-ctsym \
-	    $(CT_DATA_DESCRIPTION) \
-	    $(IMAGES_OUTPUTDIR)/symbols/ct.sym
-	$(TOUCH) $@
-
-$(eval $(call MakeDir, $(IMAGES_OUTPUTDIR)/symbols))
-
-$(IMAGES_OUTPUTDIR)/jdk/lib/ct.sym: $(IMAGES_OUTPUTDIR)/symbols/_the.symbols
-	$(MKDIR) -p $(IMAGES_OUTPUTDIR)/jdk/lib/
-	$(JAR) cf $(IMAGES_OUTPUTDIR)/jdk/lib/ct.sym -C $(IMAGES_OUTPUTDIR)/symbols/ct.sym .
-
-JDK_TARGETS += $(IMAGES_OUTPUTDIR)/jdk/lib/ct.sym
+JDK_TARGETS += $(COPY_CTSYM)
 
 ################################################################################
 # Include custom post hook here to make it possible to augment the target lists