Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Automatically set -I<gensrc>/$module. ihse-jdk-library-branch
authorihse
Thu, 26 Apr 2018 15:52:17 +0200
branchihse-jdk-library-branch
changeset 56488 a6cb200daa5d
parent 56485 00776cd28457
child 56511 2b67c11c0db6
Automatically set -I<gensrc>/$module.
make/common/JdkNativeCompilation.gmk file | annotate | diff | comparison | revisions
make/lib/Awt2dLibraries.gmk file | annotate | diff | comparison | revisions
make/lib/CoreLibraries.gmk file | annotate | diff | comparison | revisions
make/lib/Lib-java.base.gmk file | annotate | diff | comparison | revisions
make/lib/Lib-java.desktop.gmk file | annotate | diff | comparison | revisions
make/lib/Lib-java.instrument.gmk file | annotate | diff | comparison | revisions
make/lib/Lib-java.management.gmk file | annotate | diff | comparison | revisions
make/lib/Lib-java.prefs.gmk file | annotate | diff | comparison | revisions
make/lib/Lib-java.rmi.gmk file | annotate | diff | comparison | revisions
make/lib/Lib-java.security.jgss.gmk file | annotate | diff | comparison | revisions
make/lib/Lib-java.smartcardio.gmk file | annotate | diff | comparison | revisions
make/lib/Lib-jdk.accessibility.gmk file | annotate | diff | comparison | revisions
make/lib/Lib-jdk.attach.gmk file | annotate | diff | comparison | revisions
make/lib/Lib-jdk.crypto.cryptoki.gmk file | annotate | diff | comparison | revisions
make/lib/Lib-jdk.crypto.ec.gmk file | annotate | diff | comparison | revisions
make/lib/Lib-jdk.crypto.mscapi.gmk file | annotate | diff | comparison | revisions
make/lib/Lib-jdk.crypto.ucrypto.gmk file | annotate | diff | comparison | revisions
make/lib/Lib-jdk.hotspot.agent.gmk file | annotate | diff | comparison | revisions
make/lib/Lib-jdk.internal.le.gmk file | annotate | diff | comparison | revisions
make/lib/Lib-jdk.jdi.gmk file | annotate | diff | comparison | revisions
make/lib/Lib-jdk.jdwp.agent.gmk file | annotate | diff | comparison | revisions
make/lib/Lib-jdk.management.agent.gmk file | annotate | diff | comparison | revisions
make/lib/Lib-jdk.management.gmk file | annotate | diff | comparison | revisions
make/lib/Lib-jdk.net.gmk file | annotate | diff | comparison | revisions
make/lib/Lib-jdk.pack.gmk file | annotate | diff | comparison | revisions
make/lib/Lib-jdk.sctp.gmk file | annotate | diff | comparison | revisions
make/lib/Lib-jdk.security.auth.gmk file | annotate | diff | comparison | revisions 
--- a/make/common/JdkNativeCompilation.gmk	Thu Apr 26 15:37:22 2018 +0200
+++ b/make/common/JdkNativeCompilation.gmk	Thu Apr 26 15:52:17 2018 +0200
@@ -90,7 +90,10 @@
   endif
 
   ifneq ($$($1_HEADERS_FROM_SRC), false)
-    $1_SRC_HEADER_FLAGS := $$(foreach dir, $$($1_SRC), -I$$(dir))
+    $1_SRC_HEADER_FLAGS := \
+        $$(foreach dir, $$($1_SRC), -I$$(dir)) \
+        -I$(call FindHeaderDirForModule, $(MODULE)) \
+        #
   endif
   ifneq ($$($1_CFLAGS), )
     $1_CFLAGS += $$($1_SRC_HEADER_FLAGS) $$($1_HEADER_FLAGS)
--- a/make/lib/Awt2dLibraries.gmk	Thu Apr 26 15:37:22 2018 +0200
+++ b/make/lib/Awt2dLibraries.gmk	Thu Apr 26 15:52:17 2018 +0200
@@ -203,7 +203,6 @@
     OPTIMIZATION := LOW, \
     CFLAGS := $(CFLAGS_JDKLIB) $(LIBAWT_CFLAGS), \
     HEADER_FLAGS := \
-        -I$(call FindHeaderDirForModule, $(MODULE)) \
         -I$(call FindHeaderDirForModule, java.base) \
         $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, libawt/java2d)) \
         $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, libawt/java2d/d3d)) \
@@ -321,7 +320,6 @@
         NAME := awt_xawt, \
         SRC := $(LIBAWT_XAWT_DIRS), \
         HEADER_FLAGS := \
-            -I$(call FindHeaderDirForModule, $(MODULE)) \
             $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, libawt_xawt/awt)) \
             $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, include)) \
             $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, common/java2d/opengl)) \
@@ -385,7 +383,6 @@
     CFLAGS_solaris := -xc99=no_lib, \
     CFLAGS_windows := -DCMS_IS_WINDOWS_, \
     HEADER_FLAGS := \
-        -I$(call FindHeaderDirForModule, $(MODULE)) \
         $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, common/awt/debug)) \
         $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, libawt/java2d)), \
     HEADERS_FROM_SRC := $(LIBLCMS_HEADERS_FROM_SRC), \
@@ -432,8 +429,6 @@
     INCLUDE_FILES := $(BUILD_LIBJAVAJPEG_INCLUDE_FILES), \
     OPTIMIZATION := HIGHEST, \
     CFLAGS := $(CFLAGS_JDKLIB), \
-    HEADER_FLAGS := \
-        -I$(call FindHeaderDirForModule, $(MODULE)), \
     HEADERS_FROM_SRC := $(LIBJPEG_HEADERS_FROM_SRC), \
     DISABLED_WARNINGS_gcc := clobbered implicit-fallthrough shift-negative-value, \
     LDFLAGS := $(LDFLAGS_JDKLIB) \
@@ -470,7 +465,6 @@
       CFLAGS := $(CFLAGS_JDKLIB) \
           $(LIBAWT_HEADLESS_CFLAGS), \
       HEADER_FLAGS := \
-          -I$(call FindHeaderDirForModule, $(MODULE)) \
             $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, common/awt/debug)) \
             $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, common/font)) \
             $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, common/java2d/opengl)) \
@@ -614,7 +608,6 @@
     OPTIMIZATION := $(LIBFONTMANAGER_OPTIMIZATION), \
     CFLAGS_windows = -DCC_NOEX, \
     HEADER_FLAGS := \
-        -I$(call FindHeaderDirForModule, $(MODULE)) \
         $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, common/awt)) \
         $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, common/font)) \
         $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, libawt/java2d)) \
@@ -684,7 +677,6 @@
       CXXFLAGS := $(CXXFLAGS_JDKLIB) \
           $(LIBJAWT_CFLAGS), \
       HEADER_FLAGS := \
-          -I$(call FindHeaderDirForModule, $(MODULE)) \
           $(addprefix -I, $(call FindSrcDirsForComponent, java.base, include)) \
           $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, include)) \
           $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, common/awt/debug)) \
@@ -868,7 +860,6 @@
       CXXFLAGS := $(LIBSPLASHSCREEN_CFLAGS) $(CFLAGS_JDKLIB) \
           $(GIFLIB_CFLAGS) $(LIBJPEG_CFLAGS) $(PNG_CFLAGS) $(LIBZ_CFLAGS), \
       HEADER_FLAGS := \
-          -I$(call FindHeaderDirForModule, $(MODULE)) \
           $(addprefix -I, $(call FindSrcDirsForLib, java.base, java)) \
           $(addprefix -I, $(call FindSrcDirsForLib, java.desktop, osxapp)) \
           $(addprefix -I, $(call FindSrcDirsForComponent, java.base, include)) \
@@ -922,7 +913,6 @@
       CFLAGS := $(CFLAGS_JDKLIB) \
           $(LIBAWT_LWAWT_CFLAGS), \
       HEADER_FLAGS := \
-          -I$(call FindHeaderDirForModule, $(MODULE)) \
           $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, libawt_lwawt/java2d/opengl)) \
           $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, libawt_lwawt/awt)) \
           $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, libawt_lwawt/font)) \
@@ -976,7 +966,6 @@
       OPTIMIZATION := LOW, \
       CFLAGS := $(CFLAGS_JDKLIB), \
       HEADER_FLAGS := \
-          -I$(call FindHeaderDirForModule, $(MODULE)) \
           $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, libawt_lwawt/awt)) \
           $(addprefix -I, $(call FindSrcDirsForLib, java.desktop, osxapp)), \
       DISABLED_WARNINGS_clang := deprecated-declarations, \
--- a/make/lib/CoreLibraries.gmk	Thu Apr 26 15:37:22 2018 +0200
+++ b/make/lib/CoreLibraries.gmk	Thu Apr 26 15:52:17 2018 +0200
@@ -133,7 +133,6 @@
     System.c_CFLAGS := $(VERSION_CFLAGS), \
     jdk_util.c_CFLAGS := $(VERSION_CFLAGS), \
     HEADER_FLAGS := \
-        -I$(call FindHeaderDirForModule, $(MODULE)) \
         $(addprefix -I, $(call FindSrcDirsForLib, java.base, fdlibm)), \
     WARNINGS_AS_ERRORS_xlc := false, \
     DISABLED_WARNINGS_gcc := unused-result, \
@@ -179,8 +178,6 @@
     CFLAGS := $(CFLAGS_JDKLIB) \
         $(LIBZ_CFLAGS), \
     CFLAGS_unix := $(BUILD_LIBZIP_MMAP) -UDEBUG, \
-    HEADER_FLAGS := \
-        -I$(call FindHeaderDirForModule, $(MODULE)), \
     DISABLED_WARNINGS_gcc := implicit-fallthrough, \
     LDFLAGS := $(LDFLAGS_JDKLIB) \
         $(call SET_SHARED_LIBRARY_ORIGIN), \
@@ -200,8 +197,6 @@
     OPTIMIZATION := LOW, \
     CFLAGS := $(CFLAGS_JDKLIB), \
     CXXFLAGS := $(CXXFLAGS_JDKLIB), \
-    HEADER_FLAGS := \
-        -I$(call FindHeaderDirForModule, $(MODULE)), \
     DISABLED_WARNINGS_gcc := implicit-fallthrough, \
     CFLAGS_unix := -UDEBUG, \
     LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK) \
--- a/make/lib/Lib-java.base.gmk	Thu Apr 26 15:37:22 2018 +0200
+++ b/make/lib/Lib-java.base.gmk	Thu Apr 26 15:52:17 2018 +0200
@@ -45,8 +45,6 @@
     NAME := net, \
     OPTIMIZATION := LOW, \
     CFLAGS := $(CFLAGS_JDKLIB), \
-    HEADER_FLAGS := \
-        -I$(call FindHeaderDirForModule, $(MODULE)), \
     DISABLED_WARNINGS_gcc := format-nonliteral, \
     DISABLED_WARNINGS_clang := parentheses-equality constant-logical-operand, \
     DISABLED_WARNINGS_microsoft := 4244 4047 4133 4996, \
@@ -76,7 +74,6 @@
     WARNINGS_AS_ERRORS_xlc := false, \
     CFLAGS := $(CFLAGS_JDKLIB), \
     HEADER_FLAGS := \
-        -I$(call FindHeaderDirForModule, $(MODULE)) \
         $(addprefix -I, $(call FindSrcDirsForComponent, java.base, libnio/ch)) \
         $(addprefix -I, $(call FindSrcDirsForComponent, java.base, libnio/fs)) \
         $(addprefix -I, $(call FindSrcDirsForLib, java.base, net)), \
@@ -109,8 +106,6 @@
         NAME := osxsecurity, \
         OPTIMIZATION := LOW, \
         CFLAGS := $(CFLAGS_JDKLIB), \
-        HEADER_FLAGS := \
-            -I$(call FindHeaderDirForModule, $(MODULE)), \
         DISABLED_WARNINGS_clang := deprecated-declarations, \
         LDFLAGS := $(LDFLAGS_JDKLIB) \
             -L$(SUPPORT_OUTPUTDIR)/modules_libs/java.base \
--- a/make/lib/Lib-java.desktop.gmk	Thu Apr 26 15:37:22 2018 +0200
+++ b/make/lib/Lib-java.desktop.gmk	Thu Apr 26 15:52:17 2018 +0200
@@ -66,8 +66,6 @@
       CFLAGS := $(CFLAGS_JDKLIB) \
           $(LIBJSOUND_CFLAGS), \
       CXXFLAGS := $(CXXFLAGS_JDKLIB) $(LIBJSOUND_CFLAGS), \
-      HEADER_FLAGS := \
-          -I$(call FindHeaderDirForModule, $(MODULE)), \
       LDFLAGS := $(LDFLAGS_JDKLIB) \
           $(call SET_SHARED_LIBRARY_ORIGIN), \
       LIBS_unix := -ljava -ljvm, \
@@ -93,8 +91,6 @@
       NAME := osxapp, \
       OPTIMIZATION := LOW, \
       CFLAGS := $(CFLAGS_JDKLIB), \
-      HEADER_FLAGS := \
-          -I$(call FindHeaderDirForModule, $(MODULE)), \
       DISABLED_WARNINGS_clang := objc-method-access objc-root-class \
           deprecated-declarations, \
       LDFLAGS := $(LDFLAGS_JDKLIB) \
@@ -123,7 +119,6 @@
       OPTIMIZATION := LOW, \
       CFLAGS := $(CFLAGS_JDKLIB), \
       HEADER_FLAGS := \
-          -I$(call FindHeaderDirForModule, $(MODULE)) \
           $(addprefix -I, $(call FindSrcDirsForLib, java.desktop, osxapp)), \
       DISABLED_WARNINGS_clang := deprecated-declarations, \
       LDFLAGS := $(LDFLAGS_JDKLIB) \
--- a/make/lib/Lib-java.instrument.gmk	Thu Apr 26 15:37:22 2018 +0200
+++ b/make/lib/Lib-java.instrument.gmk	Thu Apr 26 15:52:17 2018 +0200
@@ -48,7 +48,6 @@
     CFLAGS_debug := -DJPLIS_LOGGING, \
     CFLAGS_release := -DNO_JPLIS_LOGGING, \
     HEADER_FLAGS := \
-        -I$(call FindHeaderDirForModule, $(MODULE)) \
         $(addprefix -I, $(call FindSrcDirsForLib, java.base, jli)), \
     LDFLAGS := $(LDFLAGS_JDKLIB) \
         $(call SET_SHARED_LIBRARY_ORIGIN) \
--- a/make/lib/Lib-java.management.gmk	Thu Apr 26 15:37:22 2018 +0200
+++ b/make/lib/Lib-java.management.gmk	Thu Apr 26 15:52:17 2018 +0200
@@ -41,8 +41,6 @@
     NAME := management, \
     OPTIMIZATION := $(LIBMANAGEMENT_OPTIMIZATION), \
     CFLAGS := $(CFLAGS_JDKLIB), \
-    HEADER_FLAGS := \
-        -I$(call FindHeaderDirForModule, $(MODULE)), \
     LDFLAGS := $(LDFLAGS_JDKLIB) \
         $(call SET_SHARED_LIBRARY_ORIGIN), \
     LIBS := $(JDKLIB_LIBS), \
--- a/make/lib/Lib-java.prefs.gmk	Thu Apr 26 15:37:22 2018 +0200
+++ b/make/lib/Lib-java.prefs.gmk	Thu Apr 26 15:52:17 2018 +0200
@@ -39,8 +39,6 @@
     SRC := $(LIBPREF_SRC_DIRS), \
     OPTIMIZATION := HIGH, \
     CFLAGS := $(CFLAGS_JDKLIB), \
-    HEADER_FLAGS := \
-        -I$(call FindHeaderDirForModule, $(MODULE)), \
     LDFLAGS := $(LDFLAGS_JDKLIB) \
         $(call SET_SHARED_LIBRARY_ORIGIN), \
     LIBS_unix := -ljvm, \
--- a/make/lib/Lib-java.rmi.gmk	Thu Apr 26 15:37:22 2018 +0200
+++ b/make/lib/Lib-java.rmi.gmk	Thu Apr 26 15:52:17 2018 +0200
@@ -31,8 +31,6 @@
     NAME := rmi, \
     OPTIMIZATION := LOW, \
     CFLAGS := $(CFLAGS_JDKLIB), \
-    HEADER_FLAGS := \
-        -I$(call FindHeaderDirForModule, $(MODULE)), \
     LDFLAGS := $(LDFLAGS_JDKLIB) \
         $(call SET_SHARED_LIBRARY_ORIGIN), \
     LIBS_unix := -ljvm, \
--- a/make/lib/Lib-java.security.jgss.gmk	Thu Apr 26 15:37:22 2018 +0200
+++ b/make/lib/Lib-java.security.jgss.gmk	Thu Apr 26 15:52:17 2018 +0200
@@ -31,8 +31,6 @@
     NAME := j2gss, \
     OPTIMIZATION := LOW, \
     CFLAGS := $(CFLAGS_JDKLIB), \
-    HEADER_FLAGS := \
-        -I$(call FindHeaderDirForModule, $(MODULE)), \
     LDFLAGS := $(LDFLAGS_JDKLIB) \
         $(call SET_SHARED_LIBRARY_ORIGIN), \
     LIBS := $(LIBDL), \
@@ -49,8 +47,6 @@
         NAME := w2k_lsa_auth, \
         OPTIMIZATION := LOW, \
         CFLAGS := $(CFLAGS_JDKLIB), \
-        HEADER_FLAGS := \
-            -I$(call FindHeaderDirForModule, $(MODULE)), \
         LDFLAGS := $(LDFLAGS_JDKLIB) \
             $(call SET_SHARED_LIBRARY_ORIGIN), \
         LIBS := advapi32.lib Secur32.lib netapi32.lib kernel32.lib user32.lib \
@@ -68,8 +64,6 @@
         NAME := osxkrb5, \
         OPTIMIZATION := LOW, \
         CFLAGS := $(CFLAGS_JDKLIB), \
-        HEADER_FLAGS := \
-            -I$(call FindHeaderDirForModule, $(MODULE)), \
         DISABLED_WARNINGS_clang := deprecated-declarations, \
         LDFLAGS := $(LDFLAGS_JDKLIB) \
             $(call SET_SHARED_LIBRARY_ORIGIN), \
--- a/make/lib/Lib-java.smartcardio.gmk	Thu Apr 26 15:37:22 2018 +0200
+++ b/make/lib/Lib-java.smartcardio.gmk	Thu Apr 26 15:52:17 2018 +0200
@@ -32,7 +32,6 @@
     CFLAGS := $(CFLAGS_JDKLIB), \
     CFLAGS_unix := -D__sun_jdk, \
     HEADER_FLAGS := \
-        -I$(call FindHeaderDirForModule, $(MODULE)) \
         $(addprefix -I, $(call FindSrcDirsForComponent, $(MODULE), libj2pcsc/MUSCLE)), \
     OPTIMIZATION := LOW, \
     LDFLAGS := $(LDFLAGS_JDKLIB) \
--- a/make/lib/Lib-jdk.accessibility.gmk	Thu Apr 26 15:37:22 2018 +0200
+++ b/make/lib/Lib-jdk.accessibility.gmk	Thu Apr 26 15:52:17 2018 +0200
@@ -46,7 +46,6 @@
         CFLAGS := $(CFLAGS_JDKLIB) \
             -DACCESSBRIDGE_ARCH_$2, \
         HEADER_FLAGS := \
-            -I$(call FindHeaderDirForModule, $(MODULE)) \
             $(addprefix -I, $(call FindSrcDirsForComponent, jdk.accessibility, include/bridge)) \
             $(addprefix -I, $(call FindSrcDirsForComponent, java.base, include)) \
             $(addprefix -I, $(call FindSrcDirsForComponent, java.desktop, include)), \
--- a/make/lib/Lib-jdk.attach.gmk	Thu Apr 26 15:37:22 2018 +0200
+++ b/make/lib/Lib-jdk.attach.gmk	Thu Apr 26 15:52:17 2018 +0200
@@ -39,8 +39,6 @@
     OPTIMIZATION := LOW, \
     CFLAGS := $(CFLAGS_JDKLIB) $(LIBATTACH_CFLAGS), \
     CFLAGS_windows := /Gy, \
-    HEADER_FLAGS := \
-        -I$(call FindHeaderDirForModule, $(MODULE)), \
     LDFLAGS := $(LDFLAGS_JDKLIB) \
         $(call SET_SHARED_LIBRARY_ORIGIN), \
     LIBS := $(JDKLIB_LIBS), \
--- a/make/lib/Lib-jdk.crypto.cryptoki.gmk	Thu Apr 26 15:37:22 2018 +0200
+++ b/make/lib/Lib-jdk.crypto.cryptoki.gmk	Thu Apr 26 15:52:17 2018 +0200
@@ -31,8 +31,6 @@
     NAME := j2pkcs11, \
     OPTIMIZATION := LOW, \
     CFLAGS := $(CFLAGS_JDKLIB), \
-    HEADER_FLAGS := \
-        -I$(call FindHeaderDirForModule, $(MODULE)), \
     LDFLAGS := $(LDFLAGS_JDKLIB) \
         $(call SET_SHARED_LIBRARY_ORIGIN), \
     LIBS_unix := $(LIBDL), \
--- a/make/lib/Lib-jdk.crypto.ec.gmk	Thu Apr 26 15:37:22 2018 +0200
+++ b/make/lib/Lib-jdk.crypto.ec.gmk	Thu Apr 26 15:52:17 2018 +0200
@@ -45,8 +45,6 @@
       CFLAGS := $(BUILD_LIBSUNEC_CFLAGS_JDKLIB) \
           -DMP_API_COMPATIBLE -DNSS_ECC_MORE_THAN_SUITE_B, \
       CXXFLAGS := $(BUILD_LIBSUNEC_CXXFLAGS_JDKLIB), \
-      HEADER_FLAGS := \
-          -I$(call FindHeaderDirForModule, $(MODULE)), \
       DISABLED_WARNINGS_gcc := sign-compare implicit-fallthrough, \
       DISABLED_WARNINGS_microsoft := 4101 4244 4146 4018, \
       LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK), \
--- a/make/lib/Lib-jdk.crypto.mscapi.gmk	Thu Apr 26 15:37:22 2018 +0200
+++ b/make/lib/Lib-jdk.crypto.mscapi.gmk	Thu Apr 26 15:52:17 2018 +0200
@@ -33,8 +33,6 @@
       NAME := sunmscapi, \
       OPTIMIZATION := LOW, \
       CXXFLAGS := $(CXXFLAGS_JDKLIB), \
-      HEADER_FLAGS := \
-          -I$(call FindHeaderDirForModule, $(MODULE)), \
       LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK) \
           $(call SET_SHARED_LIBRARY_ORIGIN), \
       LIBS := crypt32.lib advapi32.lib, \
--- a/make/lib/Lib-jdk.crypto.ucrypto.gmk	Thu Apr 26 15:37:22 2018 +0200
+++ b/make/lib/Lib-jdk.crypto.ucrypto.gmk	Thu Apr 26 15:52:17 2018 +0200
@@ -33,8 +33,6 @@
       NAME := j2ucrypto, \
       OPTIMIZATION := LOW, \
       CFLAGS := $(CFLAGS_JDKLIB), \
-      HEADER_FLAGS := \
-          -I$(call FindHeaderDirForModule, $(MODULE)), \
       LDFLAGS := $(LDFLAGS_JDKLIB), \
       LIBS := $(LIBDL), \
   ))
--- a/make/lib/Lib-jdk.hotspot.agent.gmk	Thu Apr 26 15:37:22 2018 +0200
+++ b/make/lib/Lib-jdk.hotspot.agent.gmk	Thu Apr 26 15:52:17 2018 +0200
@@ -57,8 +57,6 @@
     DISABLED_WARNINGS_CXX_solstudio := truncwarn unknownpragma, \
     CFLAGS := $(CFLAGS_JDKLIB) $(SA_CFLAGS), \
     CXXFLAGS := $(CXXFLAGS_JDKLIB) $(SA_CFLAGS) $(SA_CXXFLAGS), \
-    HEADER_FLAGS := \
-        -I$(call FindHeaderDirForModule, $(MODULE)), \
     LDFLAGS := $(LDFLAGS_JDKLIB) $(SA_LDFLAGS), \
     LIBS_linux := -lthread_db $(LIBDL), \
     LIBS_solaris := -ldl -ldemangle -lthread -lproc, \
--- a/make/lib/Lib-jdk.internal.le.gmk	Thu Apr 26 15:37:22 2018 +0200
+++ b/make/lib/Lib-jdk.internal.le.gmk	Thu Apr 26 15:52:17 2018 +0200
@@ -33,8 +33,6 @@
       NAME := le, \
       OPTIMIZATION := LOW, \
       CXXFLAGS := $(CXXFLAGS_JDKLIB), \
-      HEADER_FLAGS := \
-          -I$(call FindHeaderDirForModule, $(MODULE)), \
       LDFLAGS := $(LDFLAGS_JDKLIB), \
       LIBS := $(JDKLIB_LIBS) user32.lib, \
   ))
--- a/make/lib/Lib-jdk.jdi.gmk	Thu Apr 26 15:37:22 2018 +0200
+++ b/make/lib/Lib-jdk.jdi.gmk	Thu Apr 26 15:52:17 2018 +0200
@@ -34,7 +34,6 @@
       OPTIMIZATION := LOW, \
       CFLAGS := $(CFLAGS_JDKLIB) -DUSE_MMAP, \
       HEADER_FLAGS := \
-          -I$(call FindHeaderDirForModule, $(MODULE)) \
           -I$(TOPDIR)/src/jdk.jdwp.agent/share/native/include \
           -I$(TOPDIR)/src/jdk.jdwp.agent/share/native/libjdwp/export, \
       LDFLAGS := $(LDFLAGS_JDKLIB), \
--- a/make/lib/Lib-jdk.jdwp.agent.gmk	Thu Apr 26 15:37:22 2018 +0200
+++ b/make/lib/Lib-jdk.jdwp.agent.gmk	Thu Apr 26 15:52:17 2018 +0200
@@ -55,7 +55,6 @@
     OPTIMIZATION := LOW, \
     CFLAGS := $(CFLAGS_JDKLIB) -DJDWP_LOGGING, \
     HEADER_FLAGS := \
-      -I$(call FindHeaderDirForModule, $(MODULE)) \
       -I$(TOPDIR)/src/jdk.jdwp.agent/share/native/include \
       -I$(TOPDIR)/src/jdk.jdwp.agent/share/native/libjdwp/export, \
     LDFLAGS := $(LDFLAGS_JDKLIB) \
--- a/make/lib/Lib-jdk.management.agent.gmk	Thu Apr 26 15:37:22 2018 +0200
+++ b/make/lib/Lib-jdk.management.agent.gmk	Thu Apr 26 15:52:17 2018 +0200
@@ -31,8 +31,6 @@
     NAME := management_agent, \
     OPTIMIZATION := LOW, \
     CFLAGS := $(CFLAGS_JDKLIB), \
-    HEADER_FLAGS := \
-        -I$(call FindHeaderDirForModule, $(MODULE)), \
     LDFLAGS := $(LDFLAGS_JDKLIB) \
         $(call SET_SHARED_LIBRARY_ORIGIN), \
     LIBS := $(JDKLIB_LIBS), \
--- a/make/lib/Lib-jdk.management.gmk	Thu Apr 26 15:37:22 2018 +0200
+++ b/make/lib/Lib-jdk.management.gmk	Thu Apr 26 15:52:17 2018 +0200
@@ -48,8 +48,6 @@
     NAME := management_ext, \
     OPTIMIZATION := $(LIBMANAGEMENT_EXT_OPTIMIZATION), \
     CFLAGS := $(CFLAGS_JDKLIB) $(LIBMANAGEMENT_EXT_CFLAGS), \
-    HEADER_FLAGS := \
-        -I$(call FindHeaderDirForModule, $(MODULE)), \
     LDFLAGS := $(LDFLAGS_JDKLIB) \
         $(call SET_SHARED_LIBRARY_ORIGIN), \
     LIBS := $(JDKLIB_LIBS), \
--- a/make/lib/Lib-jdk.net.gmk	Thu Apr 26 15:37:22 2018 +0200
+++ b/make/lib/Lib-jdk.net.gmk	Thu Apr 26 15:52:17 2018 +0200
@@ -33,8 +33,6 @@
       NAME := extnet, \
       OPTIMIZATION := LOW, \
       CFLAGS := $(CFLAGS_JDKLIB), \
-      HEADER_FLAGS := \
-          -I$(call FindHeaderDirForModule, $(MODULE)), \
       LDFLAGS := $(LDFLAGS_JDKLIB) \
           $(call SET_SHARED_LIBRARY_ORIGIN), \
       LIBS := -ljava, \
--- a/make/lib/Lib-jdk.pack.gmk	Thu Apr 26 15:37:22 2018 +0200
+++ b/make/lib/Lib-jdk.pack.gmk	Thu Apr 26 15:52:17 2018 +0200
@@ -40,8 +40,6 @@
     CXXFLAGS := $(CXXFLAGS_JDKLIB) \
         -DNO_ZLIB -DUNPACK_JNI -DFULL, \
     CFLAGS_release := -DPRODUCT, \
-    HEADER_FLAGS := \
-            -I$(call FindHeaderDirForModule, java.base), \
     DISABLED_WARNINGS_gcc := implicit-fallthrough, \
     LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK) \
         $(call SET_SHARED_LIBRARY_ORIGIN), \
--- a/make/lib/Lib-jdk.sctp.gmk	Thu Apr 26 15:37:22 2018 +0200
+++ b/make/lib/Lib-jdk.sctp.gmk	Thu Apr 26 15:52:17 2018 +0200
@@ -35,7 +35,6 @@
         OPTIMIZATION := LOW, \
         CFLAGS := $(CFLAGS_JDKLIB), \
         HEADER_FLAGS := \
-            -I$(call FindHeaderDirForModule, $(MODULE)) \
             -I$(call FindHeaderDirForModule, java.base) \
             $(addprefix -I, $(call FindSrcDirsForLib, java.base, net)) \
             $(addprefix -I, $(call FindSrcDirsForComponent, java.base, libnio/ch)), \
--- a/make/lib/Lib-jdk.security.auth.gmk	Thu Apr 26 15:37:22 2018 +0200
+++ b/make/lib/Lib-jdk.security.auth.gmk	Thu Apr 26 15:52:17 2018 +0200
@@ -31,8 +31,6 @@
     NAME := jaas, \
     OPTIMIZATION := LOW, \
     CFLAGS := $(CFLAGS_JDKLIB), \
-    HEADER_FLAGS := \
-        -I$(call FindHeaderDirForModule, $(MODULE)), \
     LDFLAGS := $(LDFLAGS_JDKLIB) \
         $(call SET_SHARED_LIBRARY_ORIGIN), \
     LIBS_windows := netapi32.lib user32.lib mpr.lib advapi32.lib $(JDKLIB_LIBS), \
jdk-sandbox