--- a/make/lib/Lib-java.prefs.gmk Tue Feb 13 15:28:07 2018 +0100
+++ b/make/lib/Lib-java.prefs.gmk Mon Jun 11 11:23:20 2018 +0200
@@ -27,33 +27,24 @@
################################################################################
+# libprefs on macosx do not use the unix code
ifeq ($(OPENJDK_TARGET_OS), macosx)
- LIBPREF_SRC_DIRS := $(TOPDIR)/src/java.prefs/macosx/native/libprefs
-else
- LIBPREF_SRC_DIRS := $(TOPDIR)/src/java.prefs/$(OPENJDK_TARGET_OS_TYPE)/native/libprefs
+ LIBPREFS_EXCLUDE_SRC_PATTERNS := unix
endif
-$(eval $(call SetupNativeCompilation,BUILD_LIBPREFS, \
- LIBRARY := prefs, \
- OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
- SRC := $(LIBPREF_SRC_DIRS), \
+$(eval $(call SetupJdkLibrary, BUILD_LIBPREFS, \
+ NAME := prefs, \
+ EXCLUDE_SRC_PATTERNS := $(LIBPREFS_EXCLUDE_SRC_PATTERNS), \
OPTIMIZATION := HIGH, \
- CFLAGS := $(CFLAGS_JDKLIB) $(addprefix -I, $(LIBPREF_SRC_DIRS)) \
- $(LIBJAVA_HEADER_FLAGS), \
+ CFLAGS := $(CFLAGS_JDKLIB), \
LDFLAGS := $(LDFLAGS_JDKLIB) \
$(call SET_SHARED_LIBRARY_ORIGIN), \
LIBS_unix := -ljvm, \
LIBS_linux := -ljava, \
- LIBS_solaris := -ljava -lc, \
+ LIBS_solaris := -ljava, \
LIBS_aix := -ljava, \
LIBS_macosx := -framework CoreFoundation -framework Foundation, \
LIBS_windows := advapi32.lib jvm.lib $(WIN_JAVA_LIB), \
- VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \
- RC_FLAGS := $(RC_FLAGS) \
- -D "JDK_FNAME=prefs.dll" \
- -D "JDK_INTERNAL_NAME=prefs" \
- -D "JDK_FTYPE=0x2L", \
- OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libprefs, \
))
$(BUILD_LIBPREFS): $(call FindLib, java.base, java)