Mercurial > hg > openjdk > jdk8 > jdk
changeset 8194:719befd87c7b jdk8-b111
Merge
author | katleman |
---|---|
date | Tue, 08 Oct 2013 13:10:15 -0700 |
parents | 9f57d2774603 (current diff) 760af86b3f3f (diff) |
children | 7af04d2d2139 28191d3ff921 86df2e879eca a1d91e198ddf |
files | |
diffstat | 2 files changed, 2 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/makefiles/CreateJars.gmk Wed Oct 02 13:26:45 2013 -0700 +++ b/makefiles/CreateJars.gmk Tue Oct 08 13:10:15 2013 -0700 @@ -863,26 +863,13 @@ com/sun/java_cup \ com/sun/javadoc \ com/sun/java/swing \ - com/sun/jlex \ com/sun/jmx \ com/sun/naming \ com/sun/org/apache \ com/sun/security/auth \ com/sun/security/jgss \ com/sun/source \ - java/applet \ - java/awt \ - java/beans \ - java/io \ - java/lang \ - java/math \ - java/net \ - java/nio \ - java/rmi \ - java/security \ - java/sql \ - java/text \ - java/util \ + java \ javax/accessibility \ javax/annotation \ javax/imageio \ @@ -902,7 +889,7 @@ org/omg \ org/w3c/dom \ org/xml/sax \ - sunw + # SRC_ZIP_SRCS = $(JDK_TOPDIR)/src/share/classes $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/classes SRC_ZIP_SRCS += $(JDK_OUTPUTDIR)/gensrc
--- a/makefiles/Tools.gmk Wed Oct 02 13:26:45 2013 -0700 +++ b/makefiles/Tools.gmk Tue Oct 08 13:10:15 2013 -0700 @@ -25,7 +25,6 @@ # Cache all finds needed for this file. Only used on windows. $(eval $(call FillCacheFind,$(JDK_TOPDIR)/make/tools \ - $(JDK_TOPDIR)/src/solaris/classes \ $(JDK_TOPDIR)/makefiles/sun)) TOOLS_SRC:=$(JDK_TOPDIR)/make/tools/src \