From 8a881bc7285b6e97e188c8c88bccb07502f65005 Mon Sep 17 00:00:00 2001
From: ptbrunet <unknown>
Date: Thu, 26 Sep 2013 10:48:56 +0200
Subject: [PATCH] 8025160: Recent Java Accessibility Bridge push has make
 failures Reviewed-by: tbell, erikj

---
 make/bridge/AccessBridgeJava/Makefile | 1 -
 makefiles/CreateJars.gmk              | 7 +++----
 makefiles/GensrcMisc.gmk              | 4 ++++
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/make/bridge/AccessBridgeJava/Makefile b/make/bridge/AccessBridgeJava/Makefile
index e143f987e..bbba63099 100644
--- a/make/bridge/AccessBridgeJava/Makefile
+++ b/make/bridge/AccessBridgeJava/Makefile
@@ -61,7 +61,6 @@ CLASSDESTDIR = $(TEMPDIR)/classes
 #
 # Rules
 #
-CLASSDESTDIR = $(TEMPDIR)/classes
 
 FILES_class = $(FILES_java:%.java=$(CLASSDESTDIR)/%.class)
 
diff --git a/makefiles/CreateJars.gmk b/makefiles/CreateJars.gmk
index e1d0a5d31..be721548d 100644
--- a/makefiles/CreateJars.gmk
+++ b/makefiles/CreateJars.gmk
@@ -953,13 +953,13 @@ ifeq ($(OPENJDK_TARGET_OS), windows)
 
     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 @@ ifeq ($(OPENJDK_TARGET_OS), windows)
 		$(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 --git a/makefiles/GensrcMisc.gmk b/makefiles/GensrcMisc.gmk
index c879de348..d557499cc 100644
--- a/makefiles/GensrcMisc.gmk
+++ b/makefiles/GensrcMisc.gmk
@@ -226,6 +226,10 @@ ifeq ($(OPENJDK_TARGET_OS), windows)
 			$(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
 
-- 
GitLab