# HG changeset patch
# User ihse
# Date 1525387945 -7200
# Node ID e9a717e79a59f2bf41d501d9274ab8aa5e6be7a3
# Parent  1b154e6d8bb24df06ae672913c7342079be15cb6
Rename FindHeaderDirForModule to GetJavaHeaderDir.

diff -r 1b154e6d8bb2 -r e9a717e79a59 make/common/JdkNativeCompilation.gmk
--- a/make/common/JdkNativeCompilation.gmk	Fri May 04 00:50:29 2018 +0200
+++ b/make/common/JdkNativeCompilation.gmk	Fri May 04 00:52:25 2018 +0200
@@ -47,7 +47,7 @@
       $(TOPDIR)/src/$(strip $1)/$(OPENJDK_TARGET_OS_TYPE)/native/$(strip $2) \
       $(TOPDIR)/src/$(strip $1)/share/native/$(strip $2)))
 
-FindHeaderDirForModule = \
+GetJavaHeaderDir = \
   $(wildcard $(SUPPORT_OUTPUTDIR)/headers/$(strip $1))
 
 ProcessDir = \
@@ -112,7 +112,7 @@
 
   ifneq ($$($1_HEADERS_FROM_SRC), false)
     $1_SRC_HEADER_FLAGS := $$(foreach dir, $$(wildcard $$($1_SRC) $$($1_EXTRA_SRC) \
-        $$(call FindHeaderDirForModule, $$(MODULE))), -I$$(dir))
+        $$(call GetJavaHeaderDir, $$(MODULE))), -I$$(dir))
   endif
   ifneq ($$($1_EXTRA_HEADER_DIRS), )
     $1_PROCESSED_EXTRA_HEADER_DIRS :=  $$(foreach dir, $$($1_EXTRA_HEADER_DIRS), $$(call ProcessDir, $$(dir)))
diff -r 1b154e6d8bb2 -r e9a717e79a59 make/lib/Awt2dLibraries.gmk
--- a/make/lib/Awt2dLibraries.gmk	Fri May 04 00:50:29 2018 +0200
+++ b/make/lib/Awt2dLibraries.gmk	Fri May 04 00:52:25 2018 +0200
@@ -202,7 +202,7 @@
 
 LIBAWT_EXTRA_HEADER_DIRS := \
     $(LIBAWT_DEFAULT_HEADER_DIRS) \
-    $(call FindHeaderDirForModule, java.base) \
+    $(call GetJavaHeaderDir, java.base) \
     libawt/awt/medialib \
     libawt/java2d/d3d \
     libawt/java2d/opengl \
diff -r 1b154e6d8bb2 -r e9a717e79a59 make/lib/Lib-jdk.pack.gmk
--- a/make/lib/Lib-jdk.pack.gmk	Fri May 04 00:50:29 2018 +0200
+++ b/make/lib/Lib-jdk.pack.gmk	Fri May 04 00:52:25 2018 +0200
@@ -35,7 +35,7 @@
     CXXFLAGS := $(CXXFLAGS_JDKLIB) \
         -DNO_ZLIB -DUNPACK_JNI -DFULL, \
     CFLAGS_release := -DPRODUCT, \
-    EXTRA_HEADER_DIRS := $(call FindHeaderDirForModule, java.base), \
+    EXTRA_HEADER_DIRS := $(call GetJavaHeaderDir, java.base), \
     DISABLED_WARNINGS_gcc := implicit-fallthrough, \
     LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK) \
         $(call SET_SHARED_LIBRARY_ORIGIN), \
diff -r 1b154e6d8bb2 -r e9a717e79a59 make/lib/Lib-jdk.sctp.gmk
--- a/make/lib/Lib-jdk.sctp.gmk	Fri May 04 00:50:29 2018 +0200
+++ b/make/lib/Lib-jdk.sctp.gmk	Fri May 04 00:52:25 2018 +0200
@@ -35,7 +35,7 @@
         OPTIMIZATION := LOW, \
         CFLAGS := $(CFLAGS_JDKLIB), \
         EXTRA_HEADER_DIRS := \
-            $(call FindHeaderDirForModule, java.base) \
+            $(call GetJavaHeaderDir, java.base) \
             java.base:libnet \
             java.base:libnio/ch, \
         LDFLAGS := $(LDFLAGS_JDKLIB) \