changeset 925:4f0b6455a977

6810915: Sun proprietary warnings in JDK build Reviewed-by: ohair
author jjg
date Thu, 26 Feb 2009 18:51:57 -0800
parents 2fb53eb9df14
children de1d02ad2d1d
files make/common/shared/Defs-java.gmk make/docs/Makefile make/javax/swing/beaninfo/SwingBeans.gmk
diffstat 3 files changed, 7 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/make/common/shared/Defs-java.gmk	Thu Feb 26 14:36:51 2009 -0800
+++ b/make/common/shared/Defs-java.gmk	Thu Feb 26 18:51:57 2009 -0800
@@ -129,6 +129,9 @@
 # Needed for javah
 JAVAHFLAGS += -bootclasspath $(CLASSBINDIR)
 
+# Needed for JAVADOC and BOOT_JAVACFLAGS
+NO_PROPRIETARY_API_WARNINGS = -XDignore.symbol.file=true
+
 # Langtools
 ifdef LANGTOOLS_DIST
   JAVAC_JAR   = $(LANGTOOLS_DIST)/bootstrap/lib/javac.jar
@@ -192,6 +195,8 @@
 BOOT_JAVACFLAGS  += -encoding ascii
 BOOT_JAR_JFLAGS += $(JAR_JFLAGS)
 
+BOOT_JAVACFLAGS  += $(NO_PROPRIETARY_API_WARNINGS)
+
 BOOT_JAVA_CMD      = $(BOOTDIR)/bin/java $(JAVA_TOOLS_FLAGS)
 BOOT_JAVAC_CMD     = $(BOOTDIR)/bin/javac $(JAVAC_JVM_FLAGS) $(BOOT_JAVACFLAGS)
 BOOT_JAR_CMD       = $(BOOTDIR)/bin/jar
--- a/make/docs/Makefile	Thu Feb 26 14:36:51 2009 -0800
+++ b/make/docs/Makefile	Thu Feb 26 18:51:57 2009 -0800
@@ -45,6 +45,7 @@
 DOCSTMPDIR          = $(TEMPDIR)/doctmp
 
 COMMON_JAVADOCFLAGS =					\
+		$(NO_PROPRIETARY_API_WARNINGS)		\
 		-source 1.5				\
 		-quiet					\
                 -use					\
--- a/make/javax/swing/beaninfo/SwingBeans.gmk	Thu Feb 26 14:36:51 2009 -0800
+++ b/make/javax/swing/beaninfo/SwingBeans.gmk	Thu Feb 26 18:51:57 2009 -0800
@@ -47,7 +47,7 @@
 LOCAL_JAVADOC   = $(JAVADOC_CMD) $(JAVADOCFLAGS)
 # get the absolute path to the jar command.
 PREFIX          = 1.2
-JAVADOCFLAGS    = $(LANGUAGE_VERSION)
+JAVADOCFLAGS    = $(NO_PROPRIETARY_API_WARNINGS) $(LANGUAGE_VERSION)
 SWINGPKG        = javax/swing
 LOCAL_JAVAC_FLAGS = $(OTHER_JAVACFLAGS)