make/lib/Lib-jdk.accessibility.gmk

*** 25,35 ****
  
  include LibCommon.gmk
  
  ################################################################################
  
! ifeq ($(OPENJDK_TARGET_OS), windows)
  
    ROOT_SRCDIR := $(TOPDIR)/src/jdk.accessibility/windows/native
  
    define SetupJavaDLL
      # Parameter 1 Suffix
--- 25,35 ----
  
  include LibCommon.gmk
  
  ################################################################################
  
! ifeq ($(call isTargetOs, windows), true)
  
    ROOT_SRCDIR := $(TOPDIR)/src/jdk.accessibility/windows/native
  
    define SetupJavaDLL
      # Parameter 1 Suffix
*** 98,108 ****
  
      TARGETS += $$(BUILD_ACCESSBRIDGESYSINFO)
  
    endef
  
!   ifeq ($(OPENJDK_TARGET_CPU_BITS), 32)
      $(eval $(call SetupAccessBridgeSysInfo))
      $(eval $(call SetupJavaDLL,-32,32))
      $(eval $(call SetupJavaDLL,,LEGACY))
      $(eval $(call SetupWinDLL,-32,32))
      $(eval $(call SetupWinDLL,,LEGACY))
--- 98,108 ----
  
      TARGETS += $$(BUILD_ACCESSBRIDGESYSINFO)
  
    endef
  
!   ifeq ($(call isTargetCpuBits, 32), true)
      $(eval $(call SetupAccessBridgeSysInfo))
      $(eval $(call SetupJavaDLL,-32,32))
      $(eval $(call SetupJavaDLL,,LEGACY))
      $(eval $(call SetupWinDLL,-32,32))
      $(eval $(call SetupWinDLL,,LEGACY))