# HG changeset patch
# User ptbrunet
# Date 1380185336 -7200
# Node ID 099045062d791bb97665c70f084c9dd31994d6e5
# Parent  8a39772d60622580482d0c94e1bc9c798b6bfb58
8025160: Recent Java Accessibility Bridge push has make failures
Reviewed-by: tbell, erikj

diff -r 8a39772d6062 -r 099045062d79 jdk/make/bridge/AccessBridgeJava/Makefile
--- a/jdk/make/bridge/AccessBridgeJava/Makefile	Wed Sep 25 17:42:15 2013 +0400
+++ b/jdk/make/bridge/AccessBridgeJava/Makefile	Thu Sep 26 10:48:56 2013 +0200
@@ -61,7 +61,6 @@
 #
 # Rules
 #
-CLASSDESTDIR = $(TEMPDIR)/classes
 
 FILES_class = $(FILES_java:%.java=$(CLASSDESTDIR)/%.class)
 
diff -r 8a39772d6062 -r 099045062d79 jdk/makefiles/CreateJars.gmk
--- a/jdk/makefiles/CreateJars.gmk	Wed Sep 25 17:42:15 2013 +0400
+++ b/jdk/makefiles/CreateJars.gmk	Thu Sep 26 10:48:56 2013 +0200
@@ -953,13 +953,13 @@
 
     ifeq ($(OPENJDK_TARGET_CPU_BITS), 32)
         $(eval $(call SetupArchive,BUILD_ACCESSBRIDGE_32_JAR,,\
-		SRCS:=$(JDK_OUTPUTDIR)/classes_ab/32bit $(JDK_OUTPUTDIR)/classes,\
+		SRCS:=$(JDK_OUTPUTDIR)/classes_ab/32bit,\
 		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,\
+		SRCS:=$(JDK_OUTPUTDIR)/classes_ab/legacy,\
 		INCLUDES:=com/sun/java/accessibility,\
 		JAR:=$(IMAGES_OUTPUTDIR)/lib/ext/access-bridge.jar,\
 		SKIP_METAINF:=true))
@@ -968,9 +968,8 @@
 		$(IMAGES_OUTPUTDIR)/lib/ext/access-bridge.jar
     else
         $(eval $(call SetupArchive,BUILD_ACCESSBRIDGE_64_JAR,,\
-		SRCS:=$(JDK_OUTPUTDIR)/classes_ab/64bit $(JDK_OUTPUTDIR)/classes,\
+		SRCS:=$(JDK_OUTPUTDIR)/classes_ab/64bit,\
 		INCLUDES:=com/sun/java/accessibility,\
-		EXCLUDES:=com/sun/java/accessibility/util/java,\
 		JAR:=$(IMAGES_OUTPUTDIR)/lib/ext/access-bridge-64.jar,\
 		SKIP_METAINF:=true))
 
diff -r 8a39772d6062 -r 099045062d79 jdk/makefiles/GensrcMisc.gmk
--- a/jdk/makefiles/GensrcMisc.gmk	Wed Sep 25 17:42:15 2013 +0400
+++ b/jdk/makefiles/GensrcMisc.gmk	Thu Sep 26 10:48:56 2013 +0200
@@ -226,6 +226,10 @@
 			$(AB_SRC_DIR)/64bit/AccessBridgeLoader.java
 		$(install-file)
 
+         $(AB_GENSRC_DIR)/64bit/com/sun/java/accessibility/AccessBridge.java: \
+			$(AB_SRC_DIR)/AccessBridge.java
+		$(install-file)
+
          GENSRC_MISC += $(AB_GENSRC_DIR)/64bit/com/sun/java/accessibility/AccessBridgeLoader.java \
 			$(AB_GENSRC_DIR)/64bit/com/sun/java/accessibility/AccessBridge.java