# HG changeset patch
# User ihse
# Date 1525351604 -7200
# Node ID c030d6f39dfdb85ee3414c11fe1c3615b1ca09fe
# Parent  2b67c11c0db60de56ae0109562acfaa55d36a8a4
Remove FindSrcDirsForLib.

diff -r 2b67c11c0db6 -r c030d6f39dfd make/lib/Awt2dLibraries.gmk
--- a/make/lib/Awt2dLibraries.gmk	Thu May 03 14:30:20 2018 +0200
+++ b/make/lib/Awt2dLibraries.gmk	Thu May 03 14:46:44 2018 +0200
@@ -62,7 +62,7 @@
 ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH), solaris-sparc)
 
   LIBMLIB_IMAGE_V_SRC := \
-    $(call FindSrcDirsForLib, java.desktop, mlib_image) \
+    $(call FindSrcDirsForComponent, java.desktop, libmlib_image) \
     $(call FindSrcDirsForComponent, java.desktop, common/awt/medialib) \
     #
 
@@ -208,8 +208,8 @@
         $(call FindSrcDirsForComponent, java.desktop, libawt/java2d/windows) \
         $(call FindSrcDirsForComponent, java.desktop, libawt/windows) \
         $(call FindSrcDirsForComponent, java.desktop, common/awt/medialib) \
-        $(call FindSrcDirsForLib, java.desktop, mlib_image) \
-        $(call FindSrcDirsForLib, java.base, java) \
+        $(call FindSrcDirsForComponent, java.desktop, libmlib_image) \
+        $(call FindSrcDirsForComponent, java.base, libjava) \
         $(call FindSrcDirsForComponent, java.base, include) \
         $(call FindSrcDirsForComponent, java.desktop, include) \
         $(TOPDIR)/src/java.desktop/share/native/libawt/awt/image \
@@ -666,7 +666,7 @@
           $(call FindSrcDirsForComponent, java.desktop, libawt/java2d) \
           $(call FindSrcDirsForComponent, java.desktop, libawt/java2d/windows) \
           $(call FindSrcDirsForComponent, java.desktop, libawt/windows) \
-          $(call FindSrcDirsForLib, java.base, java),\
+          $(call FindSrcDirsForComponent, java.base, libjava),\
       LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK), \
       LIBS := $(JDKLIB_LIBS) $(KERNEL32_LIB) advapi32.lib $(WIN_AWT_LIB), \
   ))
@@ -841,8 +841,8 @@
       CXXFLAGS := $(LIBSPLASHSCREEN_CFLAGS) $(CFLAGS_JDKLIB) \
           $(GIFLIB_CFLAGS) $(LIBJPEG_CFLAGS) $(PNG_CFLAGS) $(LIBZ_CFLAGS), \
       EXTRA_HEADER_DIRS := \
-          $(call FindSrcDirsForLib, java.base, java) \
-          $(call FindSrcDirsForLib, java.desktop, osxapp) \
+          $(call FindSrcDirsForComponent, java.base, libjava) \
+          $(call FindSrcDirsForComponent, java.desktop, libosxapp) \
           $(call FindSrcDirsForComponent, java.base, include) \
           $(LIBSPLASHSCREEN_HEADER_DIRS), \
       DISABLED_WARNINGS_gcc := sign-compare type-limits unused-result \
@@ -904,7 +904,7 @@
           $(call FindSrcDirsForComponent, java.desktop, libawt/java2d) \
           $(call FindSrcDirsForComponent, java.desktop, libawt/java2d/loops) \
           $(call FindSrcDirsForComponent, java.desktop, libawt/java2d/pipe) \
-          $(call FindSrcDirsForLib, java.desktop, osxapp), \
+          $(call FindSrcDirsForComponent, java.desktop, libosxapp), \
       DISABLED_WARNINGS_clang := incomplete-implementation enum-conversion \
           deprecated-declarations objc-method-access bitwise-op-parentheses \
           incompatible-pointer-types parentheses-equality extra-tokens, \
@@ -947,7 +947,7 @@
       CFLAGS := $(CFLAGS_JDKLIB), \
       EXTRA_HEADER_DIRS := \
           $(call FindSrcDirsForComponent, java.desktop, libawt_lwawt/awt) \
-          $(call FindSrcDirsForLib, java.desktop, osxapp), \
+          $(call FindSrcDirsForComponent, java.desktop, libosxapp), \
       DISABLED_WARNINGS_clang := deprecated-declarations, \
       LDFLAGS := $(LDFLAGS_JDKLIB) \
           $(call SET_SHARED_LIBRARY_ORIGIN) \
diff -r 2b67c11c0db6 -r c030d6f39dfd make/lib/CoreLibraries.gmk
--- a/make/lib/CoreLibraries.gmk	Thu May 03 14:30:20 2018 +0200
+++ b/make/lib/CoreLibraries.gmk	Thu May 03 14:46:44 2018 +0200
@@ -132,7 +132,7 @@
         $(LIBJAVA_CFLAGS), \
     System.c_CFLAGS := $(VERSION_CFLAGS), \
     jdk_util.c_CFLAGS := $(VERSION_CFLAGS), \
-    EXTRA_HEADER_DIRS := $(call FindSrcDirsForLib, java.base, fdlibm), \
+    EXTRA_HEADER_DIRS := $(call FindSrcDirsForComponent, java.base, libfdlibm), \
     WARNINGS_AS_ERRORS_xlc := false, \
     DISABLED_WARNINGS_gcc := unused-result, \
     DISABLED_WARNINGS_solstudio := E_STATEMENT_NOT_REACHED, \
@@ -290,7 +290,7 @@
 
 TARGETS += $(BUILD_LIBJLI)
 
-LIBJLI_SRC_DIRS := $(call FindSrcDirsForLib, java.base, jli)
+LIBJLI_SRC_DIRS := $(call FindSrcDirsForComponent, java.base, libjli)
 
 # On windows, the static library has the same suffix as the import library created by
 # with the shared library, so the static library is given a different name. No harm
diff -r 2b67c11c0db6 -r c030d6f39dfd make/lib/Lib-java.base.gmk
--- a/make/lib/Lib-java.base.gmk	Thu May 03 14:30:20 2018 +0200
+++ b/make/lib/Lib-java.base.gmk	Thu May 03 14:46:44 2018 +0200
@@ -39,8 +39,6 @@
 ################################################################################
 # Create the network library
 
-LIBNET_SRC_DIRS := $(call FindSrcDirsForLib, java.base, net)
-
 $(eval $(call SetupJdkLibrary, BUILD_LIBNET, \
     NAME := net, \
     OPTIMIZATION := LOW, \
@@ -76,7 +74,7 @@
     EXTRA_HEADER_DIRS := \
         $(call FindSrcDirsForComponent, java.base, libnio/ch) \
         $(call FindSrcDirsForComponent, java.base, libnio/fs) \
-        $(call FindSrcDirsForLib, java.base, net), \
+        $(call FindSrcDirsForComponent, java.base, libnet), \
     LDFLAGS := $(LDFLAGS_JDKLIB) \
         $(call SET_SHARED_LIBRARY_ORIGIN), \
     LIBS_unix := -ljava -lnet, \
diff -r 2b67c11c0db6 -r c030d6f39dfd make/lib/Lib-java.desktop.gmk
--- a/make/lib/Lib-java.desktop.gmk	Thu May 03 14:30:20 2018 +0200
+++ b/make/lib/Lib-java.desktop.gmk	Thu May 03 14:46:44 2018 +0200
@@ -118,7 +118,7 @@
       NAME := osx, \
       OPTIMIZATION := LOW, \
       CFLAGS := $(CFLAGS_JDKLIB), \
-      EXTRA_HEADER_DIRS := $(call FindSrcDirsForLib, java.desktop, osxapp), \
+      EXTRA_HEADER_DIRS := $(call FindSrcDirsForComponent, java.desktop, libosxapp), \
       DISABLED_WARNINGS_clang := deprecated-declarations, \
       LDFLAGS := $(LDFLAGS_JDKLIB) \
           -L$(SUPPORT_OUTPUTDIR)/modules_libs/java.desktop \
diff -r 2b67c11c0db6 -r c030d6f39dfd make/lib/Lib-java.instrument.gmk
--- a/make/lib/Lib-java.instrument.gmk	Thu May 03 14:30:20 2018 +0200
+++ b/make/lib/Lib-java.instrument.gmk	Thu May 03 14:46:44 2018 +0200
@@ -47,7 +47,7 @@
     CFLAGS := $(LIBINSTRUMENT_CFLAGS_JDKLIB) $(LIBINSTRUMENT_CFLAGS), \
     CFLAGS_debug := -DJPLIS_LOGGING, \
     CFLAGS_release := -DNO_JPLIS_LOGGING, \
-    EXTRA_HEADER_DIRS := $(call FindSrcDirsForLib, java.base, jli), \
+    EXTRA_HEADER_DIRS := $(call FindSrcDirsForComponent, java.base, libjli), \
     LDFLAGS := $(LDFLAGS_JDKLIB) \
         $(call SET_SHARED_LIBRARY_ORIGIN) \
         $(LIBINSTRUMENT_LDFLAGS), \
diff -r 2b67c11c0db6 -r c030d6f39dfd make/lib/Lib-jdk.sctp.gmk
--- a/make/lib/Lib-jdk.sctp.gmk	Thu May 03 14:30:20 2018 +0200
+++ b/make/lib/Lib-jdk.sctp.gmk	Thu May 03 14:46:44 2018 +0200
@@ -36,7 +36,7 @@
         CFLAGS := $(CFLAGS_JDKLIB), \
         EXTRA_HEADER_DIRS := \
             $(call FindHeaderDirForModule, java.base) \
-            $(call FindSrcDirsForLib, java.base, net) \
+            $(call FindSrcDirsForComponent, java.base, libnet) \
             $(call FindSrcDirsForComponent, java.base, libnio/ch), \
         LDFLAGS := $(LDFLAGS_JDKLIB) \
             $(call SET_SHARED_LIBRARY_ORIGIN), \
diff -r 2b67c11c0db6 -r c030d6f39dfd make/lib/LibCommon.gmk
--- a/make/lib/LibCommon.gmk	Thu May 03 14:30:20 2018 +0200
+++ b/make/lib/LibCommon.gmk	Thu May 03 14:46:44 2018 +0200
@@ -64,16 +64,6 @@
 endif
 
 ################################################################################
-# Find the default set of src dirs for a native library.
-# Param 1 - module name
-# Param 2 - library name
-#FindSrcDirsForLib += \
-#  $(call uniq, $(wildcard \
-#      $(TOPDIR)/src/$(strip $1)/$(OPENJDK_TARGET_OS)/native/lib$(strip $2) \
-#      $(TOPDIR)/src/$(strip $1)/$(OPENJDK_TARGET_OS_TYPE)/native/lib$(strip $2) \
-#      $(TOPDIR)/src/$(strip $1)/share/native/lib$(strip $2)))
-
-################################################################################
 # Find a library
 # Param 1 - module name
 # Param 2 - library name