fda7fbd
--- jdk8/jdk/make/CreateJars.gmk
fda7fbd
+++ jdk8/jdk/make/CreateJars.gmk
fda7fbd
@@ -569,38 +569,12 @@
fda7fbd
 ##########################################################################################
fda7fbd
 
fda7fbd
 SRC_ZIP_INCLUDES = \
fda7fbd
-    com/sun/corba \
fda7fbd
-    com/sun/image/codec/jpeg \
fda7fbd
-    com/sun/imageio \
fda7fbd
-    com/sun/java_cup \
fda7fbd
-    com/sun/javadoc \
fda7fbd
-    com/sun/java/swing \
fda7fbd
-    com/sun/jmx \
fda7fbd
-    com/sun/naming \
fda7fbd
-    com/sun/org/apache \
fda7fbd
-    com/sun/security/auth \
fda7fbd
-    com/sun/security/jgss \
fda7fbd
-    com/sun/source \
fda7fbd
+    com \
fda7fbd
     java \
fda7fbd
-    javax/accessibility \
fda7fbd
-    javax/annotation \
fda7fbd
-    javax/imageio \
fda7fbd
-    javax/lang \
fda7fbd
-    javax/management \
fda7fbd
-    javax/naming \
fda7fbd
-    javax/print \
fda7fbd
-    javax/rmi \
fda7fbd
-    javax/script \
fda7fbd
-    javax/security \
fda7fbd
-    javax/sound \
fda7fbd
-    javax/sql \
fda7fbd
-    javax/swing \
fda7fbd
-    javax/tools \
fda7fbd
-    javax/xml \
fda7fbd
-    org/ietf \
fda7fbd
-    org/omg \
fda7fbd
-    org/w3c/dom \
fda7fbd
-    org/xml/sax \
fda7fbd
+    javax \
fda7fbd
+    jdk \
fda7fbd
+    org \
fda7fbd
+    sun \
fda7fbd
     #
fda7fbd
 
fda7fbd
 SRC_ZIP_SRCS = $(JDK_TOPDIR)/src/share/classes $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/classes
fda7fbd
@@ -632,7 +606,6 @@
fda7fbd
 $(eval $(call SetupZipArchive,BUILD_SRC_ZIP, \
fda7fbd
     SRC := $(SRC_ZIP_SRCS) $(IMAGES_OUTPUTDIR)/src, \
fda7fbd
     INCLUDES := $(SRC_ZIP_INCLUDES) launcher, \
fda7fbd
-    EXCLUDES := javax/swing/beaninfo, \
fda7fbd
     SUFFIXES := .java .c .h, \
fda7fbd
     ZIP := $(IMAGES_OUTPUTDIR)/src.zip, \
fda7fbd
     EXTRA_DEPS := $(LAUNCHER_ZIP_SRC)))