make/lib/Lib-java.base.gmk
branchihse-jdk-library-branch
changeset 56454 82c3ae69914f
parent 56433 c3cf838aa2da
child 56459 4615f8554122
equal deleted inserted replaced
56435:e177cddcbf77 56454:82c3ae69914f
    27 
    27 
    28 # Hook to include the corresponding custom file, if present.
    28 # Hook to include the corresponding custom file, if present.
    29 $(eval $(call IncludeCustomExtension, lib/Lib-java.base.gmk))
    29 $(eval $(call IncludeCustomExtension, lib/Lib-java.base.gmk))
    30 
    30 
    31 # Prepare the find cache.
    31 # Prepare the find cache.
    32 LIB_java.base_SRC_DIRS += $(TOPDIR)/src/java.base/*/native
    32 $(eval $(call FillCacheFind, $(wildcard $(TOPDIR)/src/java.base/*/native)))
    33 
       
    34 $(eval $(call FillCacheFind, $(wildcard $(LIB_java.base_SRC_DIRS))))
       
    35 
    33 
    36 ################################################################################
    34 ################################################################################
    37 # Create all the core libraries
    35 # Create all the core libraries
    38 
    36 
    39 include CoreLibraries.gmk
    37 include CoreLibraries.gmk
    45 
    43 
    46 $(eval $(call SetupJdkLibrary, BUILD_LIBNET, \
    44 $(eval $(call SetupJdkLibrary, BUILD_LIBNET, \
    47     NAME := net, \
    45     NAME := net, \
    48     OPTIMIZATION := LOW, \
    46     OPTIMIZATION := LOW, \
    49     CFLAGS := $(CFLAGS_JDKLIB), \
    47     CFLAGS := $(CFLAGS_JDKLIB), \
    50     HEADER_FLAGS := -I$(SUPPORT_OUTPUTDIR)/headers/java.base \
    48     HEADER_FLAGS := \
    51         $(LIBJAVA_HEADER_FLAGS), \
    49         -I$(call FindHeaderDirForModule, $(MODULE)), \
    52     DISABLED_WARNINGS_gcc := format-nonliteral, \
    50     DISABLED_WARNINGS_gcc := format-nonliteral, \
    53     DISABLED_WARNINGS_clang := parentheses-equality constant-logical-operand, \
    51     DISABLED_WARNINGS_clang := parentheses-equality constant-logical-operand, \
    54     DISABLED_WARNINGS_microsoft := 4244 4047 4133 4996, \
    52     DISABLED_WARNINGS_microsoft := 4244 4047 4133 4996, \
    55     DISABLED_WARNINGS_solstudio := E_ARG_INCOMPATIBLE_WITH_ARG_L, \
    53     DISABLED_WARNINGS_solstudio := E_ARG_INCOMPATIBLE_WITH_ARG_L, \
    56     LDFLAGS := $(LDFLAGS_JDKLIB) \
    54     LDFLAGS := $(LDFLAGS_JDKLIB) \
    70 TARGETS += $(BUILD_LIBNET)
    68 TARGETS += $(BUILD_LIBNET)
    71 
    69 
    72 ################################################################################
    70 ################################################################################
    73 # Create the nio library
    71 # Create the nio library
    74 
    72 
    75 BUILD_LIBNIO_EXTRA_HEADERS := \
       
    76     $(call FindSrcDirsForComponent, java.base, libnio/ch) \
       
    77     $(call FindSrcDirsForComponent, java.base, libnio/fs) \
       
    78     #
       
    79 
       
    80 $(eval $(call SetupJdkLibrary, BUILD_LIBNIO, \
    73 $(eval $(call SetupJdkLibrary, BUILD_LIBNIO, \
    81     NAME := nio, \
    74     NAME := nio, \
    82     OPTIMIZATION := HIGH, \
    75     OPTIMIZATION := HIGH, \
    83     WARNINGS_AS_ERRORS_xlc := false, \
    76     WARNINGS_AS_ERRORS_xlc := false, \
    84     CFLAGS := $(CFLAGS_JDKLIB), \
    77     CFLAGS := $(CFLAGS_JDKLIB), \
    85     HEADER_FLAGS := \
    78     HEADER_FLAGS := \
    86         -I$(SUPPORT_OUTPUTDIR)/headers/java.base \
    79         -I$(call FindHeaderDirForModule, $(MODULE)) \
    87         $(LIBJAVA_HEADER_FLAGS) \
    80         $(addprefix -I, $(call FindSrcDirsForComponent, java.base, libnio/ch)) \
    88         $(addprefix -I, $(BUILD_LIBNET_SRC)) \
    81         $(addprefix -I, $(call FindSrcDirsForComponent, java.base, libnio/fs)) \
    89         $(addprefix -I, $(BUILD_LIBNIO_EXTRA_HEADERS)), \
    82         $(addprefix -I, $(call FindSrcDirsForLib, java.base, net)), \
    90     LDFLAGS := $(LDFLAGS_JDKLIB) \
    83     LDFLAGS := $(LDFLAGS_JDKLIB) \
    91         $(call SET_SHARED_LIBRARY_ORIGIN), \
    84         $(call SET_SHARED_LIBRARY_ORIGIN), \
    92     LIBS_unix := -ljava -lnet, \
    85     LIBS_unix := -ljava -lnet, \
    93     LIBS_linux := -lpthread $(LIBDL), \
    86     LIBS_linux := -lpthread $(LIBDL), \
    94     LIBS_solaris := -ljvm -lsocket -lposix4 $(LIBDL) \
    87     LIBS_solaris := -ljvm -lsocket -lposix4 $(LIBDL) \
   114 
   107 
   115     $(eval $(call SetupJdkLibrary, BUILD_LIBOSXSECURITY, \
   108     $(eval $(call SetupJdkLibrary, BUILD_LIBOSXSECURITY, \
   116         NAME := osxsecurity, \
   109         NAME := osxsecurity, \
   117         OPTIMIZATION := LOW, \
   110         OPTIMIZATION := LOW, \
   118         CFLAGS := $(CFLAGS_JDKLIB), \
   111         CFLAGS := $(CFLAGS_JDKLIB), \
   119         HEADER_FLAGS := $(LIBJAVA_HEADER_FLAGS) \
   112         HEADER_FLAGS :=  \
   120             -I$(SUPPORT_OUTPUTDIR)/headers/java.base, \
   113             -I$(SUPPORT_OUTPUTDIR)/headers/java.base, \
   121         DISABLED_WARNINGS_clang := deprecated-declarations, \
   114         DISABLED_WARNINGS_clang := deprecated-declarations, \
   122         LDFLAGS := $(LDFLAGS_JDKLIB) \
   115         LDFLAGS := $(LDFLAGS_JDKLIB) \
   123             -L$(SUPPORT_OUTPUTDIR)/modules_libs/java.base \
   116             -L$(SUPPORT_OUTPUTDIR)/modules_libs/java.base \
   124             $(call SET_SHARED_LIBRARY_ORIGIN) \
   117             $(call SET_SHARED_LIBRARY_ORIGIN) \