make/launcher/Launcher-jdk.accessibility.gmk

@@ -26,11 +26,11 @@
 include LauncherCommon.gmk
 
 ################################################################################
 # jabswitch
 
-ifeq ($(OPENJDK_TARGET_OS), windows)
+ifeq ($(call isTargetOs, windows), true)
 
   JABSWITCH_SRC := $(TOPDIR)/src/jdk.accessibility/windows/native/jabswitch
   ACCESSBRIDGE_SRC := $(TOPDIR)/src/jdk.accessibility/windows/native/common
 
   $(eval $(call SetupJdkExecutable, BUILD_JABSWITCH, \

@@ -96,11 +96,11 @@
 
     TARGETS += $$(BUILD_JACCESSWALKER$1)
 
   endef
 
-  ifeq ($(OPENJDK_TARGET_CPU_BITS), 32)
+  ifeq ($(call isTargetCpuBits, 32), true)
     $(eval $(call SetupInspector,-32,32))
     $(eval $(call SetupWalker,-32,32))
     $(eval $(call SetupInspector,,LEGACY))
     $(eval $(call SetupWalker,,LEGACY))
   else