make/lib/LibCommon.gmk

*** 23,35 ****
  # questions.
  #
  
  include JdkNativeCompilation.gmk
  
- # Hook to include the corresponding custom file, if present.
- $(eval $(call IncludeCustomExtension, lib/LibCommon.gmk))
- 
  ################################################################################
  
  GLOBAL_VERSION_INFO_RESOURCE := $(TOPDIR)/src/java.base/windows/native/common/version.rc
  
  # Absolute paths to lib files on windows for use in LIBS. Should figure out a more
--- 23,32 ----
*** 65,84 ****
      EXPORT_ALL_SYMBOLS := -qvisibility=default
    endif
  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
  # Param 3 - optional subdir for library
  FindLib = \
--- 62,71 ----
*** 92,104 ****
  # Param 3 - optional subdir for library
  FindStaticLib = \
      $(addprefix $(SUPPORT_OUTPUTDIR)/native/, \
          $(strip $1)$(strip $3)/$(LIBRARY_PREFIX)$(strip $2)$(STATIC_LIBRARY_SUFFIX))
  
- ################################################################################
- # Define the header include flags needed to compile against it.
- LIBJAVA_HEADER_FLAGS := $(addprefix -I, $(call FindSrcDirsForLib, java.base, java))
- 
  # Put the libraries here.
  INSTALL_LIBRARIES_HERE := $(call FindLibDirForModule, $(MODULE))
  
  ################################################################################
--- 79,87 ----