jdk/make/CreateJars.gmk

*** 648,667 ****
      ZIP := $(IMAGES_OUTPUTDIR)/src.zip, \
      EXTRA_DEPS := $(LAUNCHER_ZIP_SRC)))
  
  ##########################################################################################
  
!   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, \
            INCLUDES := com/sun/java/accessibility, \
            JAR := $(IMAGES_OUTPUTDIR)/lib/ext/access-bridge-32.jar, \
--- 648,658 ----
      ZIP := $(IMAGES_OUTPUTDIR)/src.zip, \
      EXTRA_DEPS := $(LAUNCHER_ZIP_SRC)))
  
  ##########################################################################################
  
! ifeq ($(OPENJDK_TARGET_OS), windows)
    ifeq ($(OPENJDK_TARGET_CPU_BITS), 32)
        $(eval $(call SetupArchive,BUILD_ACCESSBRIDGE_32_JAR, , \
            SRCS := $(JDK_OUTPUTDIR)/classes_ab/32bit, \
            INCLUDES := com/sun/java/accessibility, \
            JAR := $(IMAGES_OUTPUTDIR)/lib/ext/access-bridge-32.jar, \
*** 682,692 ****
            JAR := $(IMAGES_OUTPUTDIR)/lib/ext/access-bridge-64.jar, \
            SKIP_METAINF := true))
  
        JARS += $(IMAGES_OUTPUTDIR)/lib/ext/access-bridge-64.jar
      endif
!   endif
  
  ##########################################################################################
  
  #
  # This is an empty jar (only contains manifest) and fits poorly into framework...
--- 673,691 ----
            JAR := $(IMAGES_OUTPUTDIR)/lib/ext/access-bridge-64.jar, \
            SKIP_METAINF := true))
  
        JARS += $(IMAGES_OUTPUTDIR)/lib/ext/access-bridge-64.jar
    endif
! endif
! 
! $(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
  
  ##########################################################################################
  
  #
  # This is an empty jar (only contains manifest) and fits poorly into framework...