comparison make/lib/Lib-jdk.management.agent.gmk @ 17467:f8e75da258cd

8205124: aarch32: make build work again with jvm-variant=core Reviewed-by: duke
author enevill
date Fri, 15 Jun 2018 21:24:39 +0100
parents 7bd7a7ffa84b
children
comparison
equal deleted inserted replaced
0:7e94b32b9fb6 1:5f57035ddb6d
25 25
26 include LibCommon.gmk 26 include LibCommon.gmk
27 27
28 ################################################################################ 28 ################################################################################
29 29
30 LIBMANAGEMENT_RMI_SRC += $(JDK_TOPDIR)/src/jdk.management.agent/$(OPENJDK_TARGET_OS_TYPE)/native/libmanagement_rmi 30 LIBMANAGEMENT_AGENT_SRC += $(JDK_TOPDIR)/src/jdk.management.agent/$(OPENJDK_TARGET_OS_TYPE)/native/libmanagement_agent
31 LIBMANAGEMENT_RMI_CFLAGS := $(addprefix -I,$(LIBMANAGEMENT_RMI_SRC)) \ 31 LIBMANAGEMENT_AGENT_CFLAGS := $(addprefix -I,$(LIBMANAGEMENT_AGENT_SRC)) \
32 -I$(SUPPORT_OUTPUTDIR)/headers/jdk.management.agent \ 32 -I$(SUPPORT_OUTPUTDIR)/headers/jdk.management.agent \
33 $(LIBJAVA_HEADER_FLAGS) \ 33 $(LIBJAVA_HEADER_FLAGS) \
34 # 34 #
35 35
36 $(eval $(call SetupNativeCompilation,BUILD_LIBMANAGEMENT_RMI, \ 36 $(eval $(call SetupNativeCompilation,BUILD_LIBMANAGEMENT_AGENT, \
37 LIBRARY := management_rmi, \ 37 LIBRARY := management_agent, \
38 OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ 38 OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
39 SRC := $(LIBMANAGEMENT_RMI_SRC), \ 39 SRC := $(LIBMANAGEMENT_AGENT_SRC), \
40 OPTIMIZATION := LOW, \ 40 OPTIMIZATION := LOW, \
41 CFLAGS := $(CFLAGS_JDKLIB) $(LIBMANAGEMENT_RMI_CFLAGS), \ 41 CFLAGS := $(CFLAGS_JDKLIB) $(LIBMANAGEMENT_AGENT_CFLAGS), \
42 MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libmanagement_rmi/mapfile-vers, \ 42 MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libmanagement_agent/mapfile-vers, \
43 LDFLAGS := $(LDFLAGS_JDKLIB) \ 43 LDFLAGS := $(LDFLAGS_JDKLIB) \
44 $(call SET_SHARED_LIBRARY_ORIGIN), \ 44 $(call SET_SHARED_LIBRARY_ORIGIN), \
45 LIBS := $(JDKLIB_LIBS), \ 45 LIBS := $(JDKLIB_LIBS), \
46 LIBS_windows := $(WIN_JAVA_LIB) advapi32.lib, \ 46 LIBS_windows := $(WIN_JAVA_LIB) advapi32.lib, \
47 VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \ 47 VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \
48 RC_FLAGS := $(RC_FLAGS) \ 48 RC_FLAGS := $(RC_FLAGS) \
49 -D "JDK_FNAME=management_rmi.dll" \ 49 -D "JDK_FNAME=management_agent.dll" \
50 -D "JDK_INTERNAL_NAME=management_rmi" \ 50 -D "JDK_INTERNAL_NAME=management_agent" \
51 -D "JDK_FTYPE=0x2L", \ 51 -D "JDK_FTYPE=0x2L", \
52 OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libmanagement_rmi, \ 52 OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libmanagement_agent, \
53 )) 53 ))
54 54
55 $(BUILD_LIBMANAGEMENT_RMI): $(call FindLib, java.base, java) 55 $(BUILD_LIBMANAGEMENT_AGENT): $(call FindLib, java.base, java)
56 56
57 TARGETS += $(BUILD_LIBMANAGEMENT_RMI) 57 TARGETS += $(BUILD_LIBMANAGEMENT_AGENT)
58 58
59 ################################################################################ 59 ################################################################################