changeset 8157:09fb25645717

8025160: Recent Java Accessibility Bridge push has make failures Reviewed-by: tbell, erikj
author ptbrunet
date Thu, 26 Sep 2013 10:48:56 +0200
parents c40ed21f2939
children 0270e9b0891b
files make/bridge/AccessBridgeJava/Makefile makefiles/CreateJars.gmk makefiles/GensrcMisc.gmk
diffstat 3 files changed, 7 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/make/bridge/AccessBridgeJava/Makefile	Wed Sep 25 17:42:15 2013 +0400
+++ b/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)
 
--- a/makefiles/CreateJars.gmk	Wed Sep 25 17:42:15 2013 +0400
+++ b/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))
 
--- a/makefiles/GensrcMisc.gmk	Wed Sep 25 17:42:15 2013 +0400
+++ b/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