Mon, 02 Mar 2009 15:10:17 -0800
Merge
1.1 --- a/make/Makefile Thu Feb 26 10:57:10 2009 -0800 1.2 +++ b/make/Makefile Mon Mar 02 15:10:17 2009 -0800 1.3 @@ -112,8 +112,6 @@ 1.4 TARGET_JAVA = java 1.5 endif 1.6 1.7 -NO_PROPRIETARY_API_WARNINGS = -XDignore.symbol.file=true 1.8 - 1.9 SELF = $(lastword $(MAKEFILE_LIST)) 1.10 1.11 # for jdk, we generate the following:
2.1 --- a/make/common/shared/Defs-java.gmk Thu Feb 26 10:57:10 2009 -0800 2.2 +++ b/make/common/shared/Defs-java.gmk Mon Mar 02 15:10:17 2009 -0800 2.3 @@ -104,6 +104,9 @@ 2.4 JAVACFLAGS += -Werror 2.5 endif 2.6 2.7 +NO_PROPRIETARY_API_WARNINGS = -XDignore.symbol.file=true 2.8 +JAVACFLAGS += $(NO_PROPRIETARY_API_WARNINGS) 2.9 + 2.10 # Add the source level (currently all source is 1.5, should this be 1.6?) 2.11 LANGUAGE_VERSION = -source 1.5 2.12 JAVACFLAGS += $(LANGUAGE_VERSION) 2.13 @@ -117,7 +120,7 @@ 2.14 JAVACFLAGS += $(OTHER_JAVACFLAGS) 2.15 2.16 # Needed for javah 2.17 -JAVAHFLAGS += -bootclasspath $(CLASSBINDIR) 2.18 +JAVAHFLAGS += -classpath $(CLASSBINDIR) 2.19 2.20 # Langtools 2.21 ifdef LANGTOOLS_DIST