# HG changeset patch
# User jjg
# Date 1235703117 28800
# Node ID 638bb0cc0258774d20777cfcf5ab652611be2571
# Parent  de3c5a0416de3f7b14f14f1e4ceb86435bc80732
6810915: Sun proprietary warnings in JDK build
Reviewed-by: ohair

diff -r de3c5a0416de -r 638bb0cc0258 jdk/make/common/shared/Defs-java.gmk
--- a/jdk/make/common/shared/Defs-java.gmk	Thu Feb 26 14:36:51 2009 -0800
+++ b/jdk/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
diff -r de3c5a0416de -r 638bb0cc0258 jdk/make/docs/Makefile
--- a/jdk/make/docs/Makefile	Thu Feb 26 14:36:51 2009 -0800
+++ b/jdk/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					\
diff -r de3c5a0416de -r 638bb0cc0258 jdk/make/javax/swing/beaninfo/SwingBeans.gmk
--- a/jdk/make/javax/swing/beaninfo/SwingBeans.gmk	Thu Feb 26 14:36:51 2009 -0800
+++ b/jdk/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)