make/lib/CoreLibraries.gmk

rev 12552 : 8184682: Upgrade compression library
Reviewed-by: alanb, sherman, ahgross, jeff

*** 242,254 ****
  ##########################################################################################
  
  BUILD_LIBZIP_EXCLUDES :=
  ifeq ($(USE_EXTERNAL_LIBZ), true)
    LIBZ := -lz
!   LIBZIP_EXCLUDES += zlib-1.2.8
  else
!   ZLIB_CPPFLAGS := -I$(JDK_TOPDIR)/src/share/native/java/util/zip/zlib-1.2.8
  endif
  
  BUILD_LIBZIP_REORDER :=
  ifeq ($(OPENJDK_TARGET_OS), solaris)
    ifneq ($(OPENJDK_TARGET_CPU), x86_64)
--- 242,254 ----
  ##########################################################################################
  
  BUILD_LIBZIP_EXCLUDES :=
  ifeq ($(USE_EXTERNAL_LIBZ), true)
    LIBZ := -lz
!   LIBZIP_EXCLUDES += zlib
  else
!   ZLIB_CPPFLAGS := -I$(JDK_TOPDIR)/src/share/native/java/util/zip/zlib
  endif
  
  BUILD_LIBZIP_REORDER :=
  ifeq ($(OPENJDK_TARGET_OS), solaris)
    ifneq ($(OPENJDK_TARGET_CPU), x86_64)
*** 396,406 ****
  ifeq ($(OPENJDK_TARGET_OS), macosx)
    LIBJLI_CFLAGS += -DPACKAGE_PATH=\"$(PACKAGE_PATH)\"
  endif
  
  ifneq ($(USE_EXTERNAL_LIBZ), true)
!   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 \
        inftrees.c \
        inffast.c \
--- 396,406 ----
  ifeq ($(OPENJDK_TARGET_OS), macosx)
    LIBJLI_CFLAGS += -DPACKAGE_PATH=\"$(PACKAGE_PATH)\"
  endif
  
  ifneq ($(USE_EXTERNAL_LIBZ), true)
!   BUILD_LIBJLI_SRC_DIRS += $(JDK_TOPDIR)/src/share/native/java/util/zip/zlib
    LIBJLI_CFLAGS += $(ZLIB_CPPFLAGS)
    BUILD_LIBJLI_FILES += \
        inflate.c \
        inftrees.c \
        inffast.c \