--- a/jdk/makefiles/CreateJars.gmk Fri Jan 18 18:34:46 2013 +0400
+++ b/jdk/makefiles/CreateJars.gmk Fri Jan 18 11:33:31 2013 -0800
@@ -126,6 +126,7 @@
# Exclude list for rt.jar and resources.jar
RT_JAR_EXCLUDES := \
+ com/sun/java/accessibility \
com/sun/javadoc \
com/sun/jdi \
com/sun/jarsigner \
@@ -918,6 +919,47 @@
##########################################################################################
+ifndef OPENJDK
+ifeq ($(OPENJDK_TARGET_OS), windows)
+
+ $(eval $(call SetupArchive,BUILD_JACCESS_JAR,,\
+ SRCS:=$(JDK_OUTPUTDIR)/classes,\
+ INCLUDES:=com/sun/java/accessibility/util,\
+ JAR:=$(IMAGES_OUTPUTDIR)/lib/ext/jaccess.jar,\
+ SKIP_METAINF:=true))
+
+ JARS += $(IMAGES_OUTPUTDIR)/lib/ext/jaccess.jar
+
+ ifeq ($(OPENJDK_TARGET_CPU_BITS), 32)
+ $(eval $(call SetupArchive,BUILD_ACCESSBRIDGE_32_JAR,,\
+ SRCS:=$(JDK_OUTPUTDIR)/classes_ab/32bit $(JDK_OUTPUTDIR)/classes,\
+ INCLUDES:=com/sun/java/accessibility,\
+ JAR:=$(IMAGES_OUTPUTDIR)/lib/ext/access-bridge-32.jar,\
+ SKIP_METAINF:=true))
+
+ $(eval $(call SetupArchive,BUILD_ACCESSBRIDGE_LEGACY_JAR,,\
+ SRCS:=$(JDK_OUTPUTDIR)/classes_ab/legacy $(JDK_OUTPUTDIR)/classes,\
+ INCLUDES:=com/sun/java/accessibility,\
+ JAR:=$(IMAGES_OUTPUTDIR)/lib/ext/access-bridge.jar,\
+ SKIP_METAINF:=true))
+
+ JARS += $(IMAGES_OUTPUTDIR)/lib/ext/access-bridge-32.jar \
+ $(IMAGES_OUTPUTDIR)/lib/ext/access-bridge.jar
+ else
+ $(eval $(call SetupArchive,BUILD_ACCESSBRIDGE_64_JAR,,\
+ SRCS:=$(JDK_OUTPUTDIR)/classes_ab/64bit $(JDK_OUTPUTDIR)/classes,\
+ INCLUDES:=com/sun/java/accessibility,\
+ EXCLUDES:=com/sun/java/accessibility/util/java,\
+ JAR:=$(IMAGES_OUTPUTDIR)/lib/ext/access-bridge-64.jar,\
+ SKIP_METAINF:=true))
+
+ JARS += $(IMAGES_OUTPUTDIR)/lib/ext/access-bridge-64.jar
+ endif
+endif
+endif
+
+##########################################################################################
+
#
# This is an empty jar (only contains manifest) and fits poorly into framework...
# create simple rule instead