8161500: Use getTypeName and StringJoiner in core reflection toString methods
Reviewed-by: redestad
# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.## This code is free software; you can redistribute it and/or modify it# under the terms of the GNU General Public License version 2 only, as# published by the Free Software Foundation. Oracle designates this# particular file as subject to the "Classpath" exception as provided# by Oracle in the LICENSE file that accompanied this code.## This code is distributed in the hope that it will be useful, but WITHOUT# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License# version 2 for more details (a copy is included in the LICENSE file that# accompanied this code).## You should have received a copy of the GNU General Public License version# 2 along with this work; if not, write to the Free Software Foundation,# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.## Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA# or visit www.oracle.com if you need additional information or have any# questions.#default: allinclude $(SPEC)include MakeBase.gmkinclude Modules.gmkifeq ($(MODULE), ) $(error MODULE must be set when calling CreateJmods.gmk)endif################################################################################JMODS_DIR := $(IMAGES_OUTPUTDIR)/jmodsLIBS_DIR := $(firstword $(wildcard $(addsuffix /$(MODULE), \ $(SUPPORT_OUTPUTDIR)/modules_libs-stripped $(IMPORT_MODULES_LIBS))))CMDS_DIR := $(firstword $(wildcard $(addsuffix /$(MODULE), \ $(SUPPORT_OUTPUTDIR)/modules_cmds-stripped $(IMPORT_MODULES_CMDS))))CONF_DIR := $(firstword $(wildcard $(addsuffix /$(MODULE), \ $(SUPPORT_OUTPUTDIR)/modules_conf $(IMPORT_MODULES_CONF))))CLASSES_DIR := $(wildcard $(JDK_OUTPUTDIR)/modules/$(MODULE))$(eval $(call FillCacheFind, \ $(LIBS_DIR) $(CMDS_DIR) $(CONF_DIR) $(CLASSES_DIR) \))ifneq ($(LIBS_DIR), ) JMOD_FLAGS += --libs $(LIBS_DIR) DEPS += $(call CacheFind, $(LIBS_DIR))endififneq ($(CMDS_DIR), ) JMOD_FLAGS += --cmds $(CMDS_DIR) DEPS += $(call CacheFind, $(CMDS_DIR))endififneq ($(CONF_DIR), ) JMOD_FLAGS += --config $(CONF_DIR) DEPS += $(call CacheFind, $(CONF_DIR))endififneq ($(CLASSES_DIR), ) JMOD_FLAGS += --class-path $(CLASSES_DIR) DEPS += $(call CacheFind, $(CLASSES_DIR))endif# Add dependencies on other jmod files. Only java.base needs access to other# jmods.ifeq ($(MODULE), java.base) ALL_UPGRADEABLE_MODULES = $(call FindAllUpgradeableModules) # When creating a BUILDJDK, we don't need to add hashes to java.base ifneq ($(CREATING_BUILDJDK), true) DEPS += $(patsubst %, $(JMODS_DIR)/%.jmod, \ $(filter-out java.base $(ALL_UPGRADEABLE_MODULES), $(call FindAllModules))) EXCLUDE_PATTERN := $(strip $(subst $(SPACE),|,$(strip $(ALL_UPGRADEABLE_MODULES)))) JMOD_FLAGS += --modulepath $(JMODS_DIR) \ --hash-modules '^(?!$(EXCLUDE_PATTERN))' endifendif# Changes to the jmod tool itself should also trigger a rebuild of all jmodsDEPS += $(JMOD_CMD)ifeq ($(EXTERNAL_BUILDJDK), false) DEPS += $(call CacheFind, $(JDK_OUTPUTDIR)/modules/jdk.jlink/jdk/tools/jmod)endif# TODO: What about headers?# Create jmods in a temp dir and then move them into place to keep the# module path in $(IMAGES_OUTPUTDIR)/jmods valid at all times.$(JMODS_DIR)/$(MODULE).jmod: $(DEPS) $(call LogWarn, Creating $(patsubst $(OUTPUT_ROOT)/%, %, $@)) $(call MakeDir, $(@D) $(SUPPORT_OUTPUTDIR)/jmods) $(RM) $@ $(SUPPORT_OUTPUTDIR)/jmods/$(notdir $@) $(JMOD) create \ --module-version $(VERSION_SHORT) \ --os-name $(REQUIRED_OS_NAME) \ --os-arch $(OPENJDK_TARGET_CPU_LEGACY) \ --os-version $(REQUIRED_OS_VERSION) \ --modulepath $(JMODS_DIR) \ --exclude '**{_the.*,*.diz,*.debuginfo,*.dSYM/**,*.pdb,*.map}' \ $(JMOD_FLAGS) $(SUPPORT_OUTPUTDIR)/jmods/$(notdir $@) $(MV) $(SUPPORT_OUTPUTDIR)/jmods/$(notdir $@) $@TARGETS += $(IMAGES_OUTPUTDIR)/jmods/$(MODULE).jmod################################################################################all: $(TARGETS)################################################################################