From fb317642d012657e3d570f721ba5d134a7b02826 Mon Sep 17 00:00:00 2001
From: Jonathan Gibbons <jjg@openjdk.org>
Date: Thu, 26 Feb 2009 18:51:57 -0800
Subject: [PATCH] 6810915: Sun proprietary warnings in JDK build

Reviewed-by: ohair
---
 jdk/make/common/shared/Defs-java.gmk         | 5 +++++
 jdk/make/docs/Makefile                       | 1 +
 jdk/make/javax/swing/beaninfo/SwingBeans.gmk | 2 +-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/jdk/make/common/shared/Defs-java.gmk b/jdk/make/common/shared/Defs-java.gmk
index 9bfb96da453..8454ab2d674 100644
--- a/jdk/make/common/shared/Defs-java.gmk
+++ b/jdk/make/common/shared/Defs-java.gmk
@@ -129,6 +129,9 @@ JAVACFLAGS  += $(OTHER_JAVACFLAGS)
 # 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 @@ endif
 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 --git a/jdk/make/docs/Makefile b/jdk/make/docs/Makefile
index 07fe50e6416..492fa059160 100644
--- a/jdk/make/docs/Makefile
+++ b/jdk/make/docs/Makefile
@@ -45,6 +45,7 @@ endif
 DOCSTMPDIR          = $(TEMPDIR)/doctmp
 
 COMMON_JAVADOCFLAGS =					\
+		$(NO_PROPRIETARY_API_WARNINGS)		\
 		-source 1.5				\
 		-quiet					\
                 -use					\
diff --git a/jdk/make/javax/swing/beaninfo/SwingBeans.gmk b/jdk/make/javax/swing/beaninfo/SwingBeans.gmk
index 66f16aae1a1..cae9873e0c3 100644
--- a/jdk/make/javax/swing/beaninfo/SwingBeans.gmk
+++ b/jdk/make/javax/swing/beaninfo/SwingBeans.gmk
@@ -47,7 +47,7 @@ swing-1.2-beans-debug:
 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)