diff common/makefiles/javadoc/Javadoc.gmk @ 605:12782ec1da5f

8006872: Stop creating four jars with identical content in the new build system. Reviewed-by: erikj
author ohrstrom
date Thu, 31 Jan 2013 14:00:09 +0100
parents 2e12a508d7ae
children bebeaa04ab8e
line wrap: on
line diff
--- a/common/makefiles/javadoc/Javadoc.gmk	Wed Jan 30 13:39:23 2013 -0800
+++ b/common/makefiles/javadoc/Javadoc.gmk	Thu Jan 31 14:00:09 2013 +0100
@@ -46,14 +46,11 @@
 
 BUILD_NUMBER=$(JDK_BUILD_NUMBER)
 
-BOOT_JAVA_CMD=$(JAVA)
-
-JAVADOC_JAR = $(LANGTOOLS_DIST)/bootstrap/lib/javadoc.jar
-JAVADOC_CMD = $(BOOT_JAVA_CMD) \
+JAVADOC_CMD = $(JAVA) \
               -Xmx1024m \
 	      -Djava.awt.headless=true \
-              "-Xbootclasspath/p:$(JAVADOC_JAR)" \
-              -jar $(JAVADOC_JAR) -bootclasspath $(JDK_OUTPUTDIR)/classes
+	      $(NEW_JAVADOC) \
+	      -bootclasspath $(JDK_OUTPUTDIR)/classes
 
 # Copyright year for beginning of Java and some of the apis
 #   (Needed when creating the javadocs)