1.1 --- a/common/makefiles/javadoc/Javadoc.gmk Thu Feb 21 15:25:31 2013 -0400
1.2 +++ b/common/makefiles/javadoc/Javadoc.gmk Fri Feb 22 13:09:37 2013 -0400
1.3 @@ -46,14 +46,11 @@
1.4
1.5 BUILD_NUMBER=$(JDK_BUILD_NUMBER)
1.6
1.7 -BOOT_JAVA_CMD=$(JAVA)
1.8 -
1.9 -JAVADOC_JAR = $(LANGTOOLS_DIST)/bootstrap/lib/javadoc.jar
1.10 -JAVADOC_CMD = $(BOOT_JAVA_CMD) \
1.11 +JAVADOC_CMD = $(JAVA) \
1.12 -Xmx1024m \
1.13 -Djava.awt.headless=true \
1.14 - "-Xbootclasspath/p:$(JAVADOC_JAR)" \
1.15 - -jar $(JAVADOC_JAR) -bootclasspath $(JDK_OUTPUTDIR)/classes
1.16 + $(NEW_JAVADOC) \
1.17 + -bootclasspath $(JDK_OUTPUTDIR)/classes
1.18
1.19 # Copyright year for beginning of Java and some of the apis
1.20 # (Needed when creating the javadocs)
1.21 @@ -270,6 +267,7 @@
1.22 -use \
1.23 -keywords \
1.24 -Xdoclint:none \
1.25 + -Xprofilespath $(JDK_TOPDIR)/makefiles/profile-rtjar-includes.txt \
1.26 $(ADDITIONAL_JAVADOCFLAGS)
1.27
1.28 ifdef OPENJDK
