equal
deleted
inserted
replaced
200 |
200 |
201 ########################################################################################## |
201 ########################################################################################## |
202 |
202 |
203 BUILD_LIBZIP_EXCLUDES := |
203 BUILD_LIBZIP_EXCLUDES := |
204 ifeq ($(USE_EXTERNAL_LIBZ), true) |
204 ifeq ($(USE_EXTERNAL_LIBZ), true) |
205 LIBZIP_EXCLUDES += zlib-1.2.8 |
205 LIBZIP_EXCLUDES += zlib |
206 endif |
206 endif |
207 |
207 |
208 BUILD_LIBZIP_REORDER := |
208 BUILD_LIBZIP_REORDER := |
209 ifeq ($(OPENJDK_TARGET_OS), solaris) |
209 ifeq ($(OPENJDK_TARGET_OS), solaris) |
210 ifneq ($(OPENJDK_TARGET_CPU), x86_64) |
210 ifneq ($(OPENJDK_TARGET_CPU), x86_64) |
341 LIBJLI_CFLAGS += $(addprefix -I, $(LIBJLI_SRC_DIRS)) |
341 LIBJLI_CFLAGS += $(addprefix -I, $(LIBJLI_SRC_DIRS)) |
342 |
342 |
343 ifneq ($(USE_EXTERNAL_LIBZ), true) |
343 ifneq ($(USE_EXTERNAL_LIBZ), true) |
344 LIBJLI_CFLAGS += $(ZLIB_CPPFLAGS) |
344 LIBJLI_CFLAGS += $(ZLIB_CPPFLAGS) |
345 LIBJLI_EXTRA_FILES += \ |
345 LIBJLI_EXTRA_FILES += \ |
346 $(addprefix $(JDK_TOPDIR)/src/java.base/share/native/libzip/zlib-1.2.8/, \ |
346 $(addprefix $(JDK_TOPDIR)/src/java.base/share/native/libzip/zlib/, \ |
347 inflate.c \ |
347 inflate.c \ |
348 inftrees.c \ |
348 inftrees.c \ |
349 inffast.c \ |
349 inffast.c \ |
350 zadler32.c \ |
350 zadler32.c \ |
351 zcrc32.c \ |
351 zcrc32.c \ |