--- a/make/lib/Lib-jdk.accessibility.gmk Thu Apr 26 15:52:17 2018 +0200
+++ b/make/lib/Lib-jdk.accessibility.gmk Thu May 03 14:30:20 2018 +0200
@@ -45,10 +45,10 @@
DISABLED_WARNINGS_microsoft := 4311 4302 4312, \
CFLAGS := $(CFLAGS_JDKLIB) \
-DACCESSBRIDGE_ARCH_$2, \
- HEADER_FLAGS := \
- $(addprefix -I, $(call FindSrcDirsForComponent, jdk.accessibility, include/bridge)) \
- $(addprefix -I, $(call FindSrcDirsForComponent, java.base, include)) \
- $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, include)), \
+ EXTRA_HEADER_DIRS := \
+ $(call FindSrcDirsForComponent, jdk.accessibility, include/bridge) \
+ $(call FindSrcDirsForComponent, java.base, include) \
+ $(call FindSrcDirsForComponent, java.desktop, include), \
LDFLAGS := $(LDFLAGS_JDKLIB), \
LIBS := kernel32.lib user32.lib gdi32.lib \
winspool.lib comdlg32.lib advapi32.lib shell32.lib \
@@ -72,9 +72,9 @@
DISABLED_WARNINGS_microsoft := 4311 4302 4312, \
CFLAGS := $(filter-out -MD, $(CFLAGS_JDKLIB)) -MT \
-DACCESSBRIDGE_ARCH_$2, \
- HEADER_FLAGS := \
- $(addprefix -I, $(call FindSrcDirsForComponent, jdk.accessibility, include/bridge)) \
- $(addprefix -I, $(call FindSrcDirsForComponent, java.base, include)), \
+ EXTRA_HEADER_DIRS := \
+ $(call FindSrcDirsForComponent, jdk.accessibility, include/bridge) \
+ $(call FindSrcDirsForComponent, java.base, include), \
LDFLAGS := $(LDFLAGS_JDKLIB) \
-def:$(ROOT_SRCDIR)/libwindowsaccessbridge/WinAccessBridge.DEF, \
LIBS := kernel32.lib user32.lib gdi32.lib \