Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
6964311: Build regression due to rt.jar contents change
authorohair
Fri, 25 Jun 2010 08:44:20 -0700
changeset 5976 dcbee15908fc
parent 5975 076cd013e5e4
child 5978 8600638a096c
6964311: Build regression due to rt.jar contents change Summary: The fix for 6933622 regressed control builds, this is a workaround fix, filed 6964313 to find the right answer to why it happened and how to fix it correctly. Reviewed-by: alanb, darcy
jdk/make/common/Release.gmk file | annotate | diff | comparison | revisions 
--- a/jdk/make/common/Release.gmk	Thu Jun 24 14:26:35 2010 +0800
+++ b/jdk/make/common/Release.gmk	Fri Jun 25 08:44:20 2010 -0700
@@ -549,7 +549,6 @@
 
 ######################################################
 # List of directories in classes directory that should NOT be in rt.jar
-#   sun/nio/cs/ext/ will go into charsets.jar
 ######################################################
 
 NOT_RT_JAR_LIST = $(ABS_TEMPDIR)/not_rt_jar.list
@@ -572,7 +571,6 @@
 	$(ECHO) "META-INF/services/com.sun.tools.xjc.Plugin" >> $@
 	$(ECHO) "com/sun/tools/" >> $@
 	$(ECHO) "sun/jvmstat/" >> $@
-	$(ECHO) "sun/nio/cs/ext/" >> $@
 	$(ECHO) "sun/rmi/rmic/" >> $@
 	$(ECHO) "sun/tools/asm/" >> $@
 	$(ECHO) "sun/tools/java/" >> $@
jdk-sandbox