archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-24 21:34:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8273494: Zero: Put libjvm.so into "zero" folder, not "server"

Browse source 
Reviewed-by: ihse, sgehwolf
This commit is contained in:
Aleksey Shipilev 2021-09-15 08:56:53 +00:00
parent 92c30c941b
commit 8fbcc8239a
6 changed files with 11 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

4
make/modules/java.base/Copy.gmk
View file

@ -95,9 +95,9 @@ ifeq ($(call And, $(call isTargetOs, windows) $(call isTargetCpu, x86)), true)
endif
DEFAULT_CFG_VARIANT ?= server
# Any variant other than server, client or minimal is represented as server in
# Any variant other than server, client, minimal, or zero is represented as server in
# the cfg file.
VALID_CFG_VARIANTS := server client minimal
VALID_CFG_VARIANTS := server client minimal zero
CFG_VARIANTS := $(filter $(VALID_CFG_VARIANTS), $(JVM_VARIANTS)) \
$(if $(filter-out $(VALID_CFG_VARIANTS), $(JVM_VARIANTS)), server)

6
make/modules/java.base/Lib.gmk
View file

@ -156,10 +156,10 @@ ifeq ($(call isTargetOsType, unix), true)
TARGETS += $(LIB_OUTPUTDIR)/$1/$(call SHARED_LIBRARY,jsig)
endef
# The subdir is the same as the variant for client and minimal, for all
# The subdir is the same as the variant for client, minimal or zero, for all
# others it's server.
VARIANT_SUBDIRS := $(filter client minimal, $(JVM_VARIANTS)) \
$(if $(filter-out client minimal, $(JVM_VARIANTS)), server)
VARIANT_SUBDIRS := $(filter client minimal zero, $(JVM_VARIANTS)) \
$(if $(filter-out client minimal zero, $(JVM_VARIANTS)), server)
$(foreach v, $(VARIANT_SUBDIRS), $(eval $(call CreateSymlinks,$v)))
endif
############################################################################