--- a/make/lib/Lib-jdk.pack.gmk Thu Mar 15 10:01:56 2018 +0100
+++ b/make/lib/Lib-jdk.pack.gmk Mon Jun 11 12:10:55 2018 +0200
@@ -29,19 +29,15 @@
$(eval $(call SetupJdkLibrary, BUILD_LIBUNPACK, \
NAME := unpack, \
- SRC := $(TOPDIR)/src/jdk.pack/share/native/libunpack \
- $(TOPDIR)/src/jdk.pack/share/native/common-unpack, \
+ EXTRA_SRC := 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), \
+ -DNO_ZLIB -DUNPACK_JNI -DFULL, \
CFLAGS_release := -DPRODUCT, \
+ EXTRA_HEADER_DIRS := $(call GetJavaHeaderDir, java.base), \
DISABLED_WARNINGS_gcc := implicit-fallthrough, \
DISABLED_WARNINGS_solstudio := wunreachable, \
- MAPFILE := $(TOPDIR)/make/mapfiles/libunpack/mapfile-vers, \
LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK) \
$(call SET_SHARED_LIBRARY_ORIGIN), \
LDFLAGS_windows := -map:$(SUPPORT_OUTPUTDIR)/native/$(MODULE)/unpack.map -debug, \