8199639: Introduce SetupJdkLibrary and SetupJdkExecutable
Reviewed-by: erikj
diff --git a/make/lib/Lib-java.rmi.gmk b/make/lib/Lib-java.rmi.gmk
index 1ca98bb..1be2595 100644
--- a/make/lib/Lib-java.rmi.gmk
+++ b/make/lib/Lib-java.rmi.gmk
@@ -27,9 +27,8 @@
################################################################################
-$(eval $(call SetupNativeCompilation, BUILD_LIBRMI, \
+$(eval $(call SetupJdkLibrary, BUILD_LIBRMI, \
NAME := rmi, \
- OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
SRC := $(TOPDIR)/src/java.rmi/share/native/librmi, \
OPTIMIZATION := LOW, \
CFLAGS := $(CFLAGS_JDKLIB) -I$(SUPPORT_OUTPUTDIR)/headers/java.rmi, \
@@ -38,12 +37,6 @@
$(call SET_SHARED_LIBRARY_ORIGIN), \
LIBS_unix := -ljvm, \
LIBS_windows := jvm.lib, \
- VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \
- RC_FLAGS := $(RC_FLAGS) \
- -D "JDK_FNAME=rmi.dll" \
- -D "JDK_INTERNAL_NAME=rmi" \
- -D "JDK_FTYPE=0x2L", \
- OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/librmi, \
))
$(BUILD_LIBRMI): $(call FindLib, java.base, java)