equal
deleted
inserted
replaced
24 # |
24 # |
25 |
25 |
26 include NativeCompilation.gmk |
26 include NativeCompilation.gmk |
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, jdk, lib/LibCommon.gmk)) |
29 $(eval $(call IncludeCustomExtension, , lib/LibCommon.gmk)) |
30 |
30 |
31 ################################################################################ |
31 ################################################################################ |
32 |
32 |
33 GLOBAL_VERSION_INFO_RESOURCE := $(JDK_TOPDIR)/src/java.base/windows/native/common/version.rc |
33 GLOBAL_VERSION_INFO_RESOURCE := $(TOPDIR)/src/java.base/windows/native/common/version.rc |
34 |
34 |
35 # Absolute paths to lib files on windows for use in LDFLAGS. Should figure out a more |
35 # Absolute paths to lib files on windows for use in LDFLAGS. Should figure out a more |
36 # elegant solution to this. |
36 # elegant solution to this. |
37 WIN_JAVA_LIB := $(SUPPORT_OUTPUTDIR)/native/java.base/libjava/java.lib |
37 WIN_JAVA_LIB := $(SUPPORT_OUTPUTDIR)/native/java.base/libjava/java.lib |
38 |
38 |
44 # Find the default set of src dirs for a native library. |
44 # Find the default set of src dirs for a native library. |
45 # Param 1 - module name |
45 # Param 1 - module name |
46 # Param 2 - library name |
46 # Param 2 - library name |
47 FindSrcDirsForLib += \ |
47 FindSrcDirsForLib += \ |
48 $(call uniq, $(wildcard \ |
48 $(call uniq, $(wildcard \ |
49 $(JDK_TOPDIR)/src/$(strip $1)/$(OPENJDK_TARGET_OS)/native/lib$(strip $2) \ |
49 $(TOPDIR)/src/$(strip $1)/$(OPENJDK_TARGET_OS)/native/lib$(strip $2) \ |
50 $(JDK_TOPDIR)/src/$(strip $1)/$(OPENJDK_TARGET_OS_TYPE)/native/lib$(strip $2) \ |
50 $(TOPDIR)/src/$(strip $1)/$(OPENJDK_TARGET_OS_TYPE)/native/lib$(strip $2) \ |
51 $(JDK_TOPDIR)/src/$(strip $1)/share/native/lib$(strip $2))) |
51 $(TOPDIR)/src/$(strip $1)/share/native/lib$(strip $2))) |
52 |
52 |
53 ################################################################################ |
53 ################################################################################ |
54 # Find a library |
54 # Find a library |
55 # Param 1 - module name |
55 # Param 1 - module name |
56 # Param 2 - library name |
56 # Param 2 - library name |
71 |
71 |
72 # Define it here since there are multiple uses. |
72 # Define it here since there are multiple uses. |
73 ifeq ($(USE_EXTERNAL_LIBZ), true) |
73 ifeq ($(USE_EXTERNAL_LIBZ), true) |
74 LIBZ := -lz |
74 LIBZ := -lz |
75 else |
75 else |
76 ZLIB_CPPFLAGS := -I$(JDK_TOPDIR)/src/java.base/share/native/libzip/zlib |
76 ZLIB_CPPFLAGS := -I$(TOPDIR)/src/java.base/share/native/libzip/zlib |
77 endif |
77 endif |
78 |
78 |
79 ############################################################################### |
79 ############################################################################### |