From 50cc54c730bb0f130991648d1547d42483edddc1 Mon Sep 17 00:00:00 2001 From: Erik Joelsson Date: Fri, 28 Aug 2020 12:03:50 -0700 Subject: [PATCH] 8252233: Put debug symbols in symbols-image Reviewed-by: ihse, aleonard --- make/Bundles.gmk | 12 +----------- make/Images.gmk | 2 ++ 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/make/Bundles.gmk b/make/Bundles.gmk index 333936d10ec..b7c8ddbfbe7 100644 --- a/make/Bundles.gmk +++ b/make/Bundles.gmk @@ -242,16 +242,6 @@ ifneq ($(filter product-bundles% legacy-bundles, $(MAKECMDGOALS)), ) ) JDK_SYMBOLS_BUNDLE_FILES := \ - $(filter \ - $(JDK_SYMBOLS_EXCLUDE_PATTERN) \ - $(SYMBOLS_EXCLUDE_PATTERN) \ - , \ - $(filter-out \ - $(JDK_IMAGE_HOMEDIR)/demo/% %.stripped.pdb \ - , \ - $(ALL_JDK_SYMBOLS_FILES) \ - ) \ - ) \ $(call FindFiles, $(SYMBOLS_IMAGE_DIR)) TEST_DEMOS_BUNDLE_FILES := $(filter $(JDK_DEMOS_IMAGE_HOMEDIR)/demo/%, \ @@ -383,7 +373,7 @@ ifneq ($(filter product-bundles% legacy-bundles, $(MAKECMDGOALS)), ) $(eval $(call SetupBundleFile, BUILD_JDK_SYMBOLS_BUNDLE, \ BUNDLE_NAME := $(JDK_SYMBOLS_BUNDLE_NAME), \ FILES := $(JDK_SYMBOLS_BUNDLE_FILES), \ - BASE_DIRS := $(JDK_SYMBOLS_IMAGE_DIR) $(wildcard $(SYMBOLS_IMAGE_DIR)), \ + BASE_DIRS := $(SYMBOLS_IMAGE_DIR), \ SUBDIR := $(JDK_BUNDLE_SUBDIR), \ UNZIP_DEBUGINFO := true, \ )) diff --git a/make/Images.gmk b/make/Images.gmk index 7864c0f6774..65458441023 100644 --- a/make/Images.gmk +++ b/make/Images.gmk @@ -238,6 +238,7 @@ endif ALL_JDK_MODULES := $(JDK_MODULES) ALL_JRE_MODULES := $(sort $(JRE_MODULES), $(foreach m, $(JRE_MODULES), \ $(call FindTransitiveDepsForModule, $m))) +ALL_SYMBOLS_MODULES := $(JDK_MODULES) ifeq ($(call isTargetOs, windows), true) LIBS_TARGET_SUBDIR := bin @@ -293,6 +294,7 @@ SetupCopyDebuginfo = \ # implementation above. $(call SetupCopyDebuginfo,JDK) $(call SetupCopyDebuginfo,JRE) +$(call SetupCopyDebuginfo,SYMBOLS) ################################################################################