jdk/make/launcher/Launcher-jdk.pack.gmk

*** 32,44 ****
  
  ################################################################################
  # The order of the object files on the link command line affects the size of the resulting
  # binary (at least on linux) which causes the size to differ between old and new build.
  
! UNPACKEXE_SRC := $(JDK_TOPDIR)/src/jdk.pack200/share/native/common-unpack \
!     $(JDK_TOPDIR)/src/jdk.pack200/share/native/unpack200
! UNPACKEXE_CFLAGS := -I$(JDK_TOPDIR)/src/jdk.pack200/share/native/common-unpack \
      -I$(JDK_TOPDIR)/src/java.base/share/native/libjava \
      -I$(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/libjava
  
  ifeq ($(USE_EXTERNAL_LIBZ), true)
    UNPACKEXE_CFLAGS += -DSYSTEM_ZLIB
--- 32,44 ----
  
  ################################################################################
  # The order of the object files on the link command line affects the size of the resulting
  # binary (at least on linux) which causes the size to differ between old and new build.
  
! UNPACKEXE_SRC := $(JDK_TOPDIR)/src/jdk.pack/share/native/common-unpack \
!     $(JDK_TOPDIR)/src/jdk.pack/share/native/unpack200
! UNPACKEXE_CFLAGS := -I$(JDK_TOPDIR)/src/jdk.pack/share/native/common-unpack \
      -I$(JDK_TOPDIR)/src/java.base/share/native/libjava \
      -I$(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/libjava
  
  ifeq ($(USE_EXTERNAL_LIBZ), true)
    UNPACKEXE_CFLAGS += -DSYSTEM_ZLIB
*** 95,105 ****
      VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \
      RC_FLAGS := $(RC_FLAGS) \
          -D "JDK_FNAME=unpack200.exe" \
          -D "JDK_INTERNAL_NAME=unpack200" \
          -D "JDK_FTYPE=0x1L", \
!     MANIFEST := $(JDK_TOPDIR)/src/jdk.pack200/windows/native/unpack200/unpack200_proto.exe.manifest, \
      MANIFEST_VERSION := $(VERSION_NUMBER_FOUR_POSITIONS), \
  ))
  
  ifneq ($(USE_EXTERNAL_LIBZ), true)
  
--- 95,105 ----
      VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \
      RC_FLAGS := $(RC_FLAGS) \
          -D "JDK_FNAME=unpack200.exe" \
          -D "JDK_INTERNAL_NAME=unpack200" \
          -D "JDK_FTYPE=0x1L", \
!     MANIFEST := $(JDK_TOPDIR)/src/jdk.pack/windows/native/unpack200/unpack200_proto.exe.manifest, \
      MANIFEST_VERSION := $(VERSION_NUMBER_FOUR_POSITIONS), \
  ))
  
  ifneq ($(USE_EXTERNAL_LIBZ), true)