8292244: Remove unnecessary include directories

Reviewed-by: erikj, prr
openjdk · Aug 12, 2022 · 45e5b31 · 45e5b31 · openjdk-notifier · Aug 12, 2022
1 parent 9bfffa0
commit 45e5b31
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/make/modules/java.desktop/lib/Awt2dLibraries.gmk b/make/modules/java.desktop/lib/Awt2dLibraries.gmk
@@ -103,7 +103,6 @@ LIBAWT_EXTRA_HEADER_DIRS := \
     libmlib_image \
     include \
     java.base:libjava \
-    java.base:include \
     #
 
 LIBAWT_CFLAGS += -D__MEDIALIB_OLD_NAMES -D__USE_J2D_NAMES $(X_CFLAGS)
@@ -565,7 +564,6 @@ ifeq ($(call isTargetOs, windows), true)
       libawt/java2d \
       libawt/java2d/windows \
       libawt/windows \
-      java.base:include \
       java.base:libjava \
       #
 
@@ -732,7 +730,6 @@ ifeq ($(ENABLE_HEADLESS_ONLY), false)
 
   LIBSPLASHSCREEN_HEADER_DIRS += \
       libosxapp \
-      java.base:include \
       java.base:libjava \
       #
 

diff --git a/make/modules/jdk.accessibility/Lib.gmk b/make/modules/jdk.accessibility/Lib.gmk
@@ -45,7 +45,6 @@ ifeq ($(call isTargetOs, windows), true)
             -DACCESSBRIDGE_ARCH_$2, \
         EXTRA_HEADER_DIRS := \
             include/bridge \
-            java.base:include \
             java.desktop:include, \
         LDFLAGS := $(LDFLAGS_JDKLIB), \
         LIBS := kernel32.lib user32.lib gdi32.lib \
@@ -72,8 +71,7 @@ ifeq ($(call isTargetOs, windows), true)
         CFLAGS := $(CFLAGS_JDKLIB) \
             -DACCESSBRIDGE_ARCH_$2, \
         EXTRA_HEADER_DIRS := \
-            include/bridge \
-            java.base:include, \
+            include/bridge, \
         LDFLAGS := $(LDFLAGS_JDKLIB) \
             -def:$(ACCESSIBILITY_SRCDIR)/libwindowsaccessbridge/WinAccessBridge.DEF, \
         LIBS := kernel32.lib user32.lib gdi32.lib \