make/lib/Lib-jdk.pack.gmk

*** 27,46 ****
  
  ################################################################################
  
  $(eval $(call SetupJdkLibrary, BUILD_LIBUNPACK, \
      NAME := unpack, \
!     SRC := $(TOPDIR)/src/jdk.pack/share/native/libunpack \
!         $(TOPDIR)/src/jdk.pack/share/native/common-unpack, \
      TOOLCHAIN := TOOLCHAIN_LINK_CXX, \
      OPTIMIZATION := LOW, \
      CFLAGS := $(CXXFLAGS_JDKLIB) \
!         -DNO_ZLIB -DUNPACK_JNI -DFULL \
!         -I$(SUPPORT_OUTPUTDIR)/headers/java.base \
!         -I$(TOPDIR)/src/jdk.pack/share/native/common-unpack \
!         $(LIBJAVA_HEADER_FLAGS), \
      CFLAGS_release := -DPRODUCT, \
      DISABLED_WARNINGS_gcc := implicit-fallthrough, \
      LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK) \
          $(call SET_SHARED_LIBRARY_ORIGIN), \
      LDFLAGS_windows := -map:$(SUPPORT_OUTPUTDIR)/native/$(MODULE)/unpack.map -debug, \
      LIBS_unix := -ljvm $(LIBCXX) -ljava, \
--- 27,43 ----
  
  ################################################################################
  
  $(eval $(call SetupJdkLibrary, BUILD_LIBUNPACK, \
      NAME := unpack, \
!     EXTRA_SRC := common-unpack, \
      TOOLCHAIN := TOOLCHAIN_LINK_CXX, \
      OPTIMIZATION := LOW, \
      CFLAGS := $(CXXFLAGS_JDKLIB) \
!         -DNO_ZLIB -DUNPACK_JNI -DFULL, \
      CFLAGS_release := -DPRODUCT, \
+     EXTRA_HEADER_DIRS := $(call GetJavaHeaderDir, java.base), \
      DISABLED_WARNINGS_gcc := implicit-fallthrough, \
      LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK) \
          $(call SET_SHARED_LIBRARY_ORIGIN), \
      LDFLAGS_windows := -map:$(SUPPORT_OUTPUTDIR)/native/$(MODULE)/unpack.map -debug, \
      LIBS_unix := -ljvm $(LIBCXX) -ljava, \