--- a/jdk/make/java/nio/Makefile	Wed Jul 27 18:10:10 2011 +0100
+++ b/jdk/make/java/nio/Makefile	Thu Jul 28 13:34:31 2011 -0700
@@ -31,7 +31,8 @@
 PACKAGE = java.nio
 LIBRARY = nio
 PRODUCT = java
-OTHER_JAVACFLAGS += -Xmaxwarns 1000 -Xlint:serial -Werror
+JAVAC_MAX_WARNINGS = true
+JAVAC_WARNINGS_FATAL = true
 include $(BUILDDIR)/common/Defs.gmk
 
 NIO_SRC = $(SHARE_SRC)/classes/java/nio