--- a/jdk/make/lib/CoreLibraries.gmk Wed Jun 04 14:42:48 2014 +0200
+++ b/jdk/make/lib/CoreLibraries.gmk Wed Jun 04 11:25:13 2014 -0700
@@ -231,9 +231,9 @@
BUILD_LIBZIP_EXCLUDES :=
ifeq ($(USE_EXTERNAL_LIBZ), true)
LIBZ := -lz
- LIBZIP_EXCLUDES += zlib-1.2.5
+ LIBZIP_EXCLUDES += zlib-1.2.8
else
- ZLIB_CPPFLAGS := -I$(JDK_TOPDIR)/src/share/native/java/util/zip/zlib-1.2.5
+ ZLIB_CPPFLAGS := -I$(JDK_TOPDIR)/src/share/native/java/util/zip/zlib-1.2.8
endif
BUILD_LIBZIP_REORDER :=
@@ -410,7 +410,7 @@
endif
ifneq ($(USE_EXTERNAL_LIBZ), true)
- BUILD_LIBJLI_SRC_DIRS += $(JDK_TOPDIR)/src/share/native/java/util/zip/zlib-1.2.5
+ BUILD_LIBJLI_SRC_DIRS += $(JDK_TOPDIR)/src/share/native/java/util/zip/zlib-1.2.8
LIBJLI_CFLAGS += $(ZLIB_CPPFLAGS)
BUILD_LIBJLI_FILES += \
inflate.c \