提交 85ff06ce 编写于 作者: O ohair

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
上级 68cd1736
...@@ -549,7 +549,6 @@ DIRDIFF_JARFILE = $(BUILDTOOLJARDIR)/dirdiff.jar ...@@ -549,7 +549,6 @@ DIRDIFF_JARFILE = $(BUILDTOOLJARDIR)/dirdiff.jar
###################################################### ######################################################
# List of directories in classes directory that should NOT be in rt.jar # 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 NOT_RT_JAR_LIST = $(ABS_TEMPDIR)/not_rt_jar.list
...@@ -572,7 +571,6 @@ $(NOT_RT_JAR_LIST): FRC ...@@ -572,7 +571,6 @@ $(NOT_RT_JAR_LIST): FRC
$(ECHO) "META-INF/services/com.sun.tools.xjc.Plugin" >> $@ $(ECHO) "META-INF/services/com.sun.tools.xjc.Plugin" >> $@
$(ECHO) "com/sun/tools/" >> $@ $(ECHO) "com/sun/tools/" >> $@
$(ECHO) "sun/jvmstat/" >> $@ $(ECHO) "sun/jvmstat/" >> $@
$(ECHO) "sun/nio/cs/ext/" >> $@
$(ECHO) "sun/rmi/rmic/" >> $@ $(ECHO) "sun/rmi/rmic/" >> $@
$(ECHO) "sun/tools/asm/" >> $@ $(ECHO) "sun/tools/asm/" >> $@
$(ECHO) "sun/tools/java/" >> $@ $(ECHO) "sun/tools/java/" >> $@
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册