8009429: Miscellaneous profiles cleanup
8009428: Revert changes to $ substitution performed as part of nashorn integration
Reviewed-by: alanb, erikj
diff --git a/jdk/makefiles/Profiles.gmk b/jdk/makefiles/Profiles.gmk
index 864d98b..b4fb673 100644
--- a/jdk/makefiles/Profiles.gmk
+++ b/jdk/makefiles/Profiles.gmk
@@ -74,11 +74,11 @@
$(PROFILE_2_JARS)
ifdef OPENJDK
- PROFILE_4_JRE_JAR_FILES := $(filter-out alt-rt.jar, $(PROFILE_4_JRE_JAR_FILES))
+ FULL_JRE_JAR_FILES := $(filter-out alt-rt.jar, $(FULL_JRE_JAR_FILES))
endif
-PROFILE_4_JARS := \
- $(addprefix $(IMAGES_OUTPUTDIR)/lib/, $(PROFILE_4_JRE_JAR_FILES)) \
+FULL_JRE_JARS := \
+ $(addprefix $(IMAGES_OUTPUTDIR)/lib/, $(FULL_JRE_JAR_FILES)) \
$(PROFILE_3_JARS)
# The full set of "jar" files needed for a complete JDK (ct.sym and src.zip
@@ -86,7 +86,7 @@
# Note we need to add back the regular form of all the custom profile jars e.g.
# rt.jar and resources.jar
-ALL_JARS := $(PROFILE_4_JARS) \
+ALL_JARS := $(FULL_JRE_JARS) \
$(IMAGES_OUTPUTDIR)/lib/rt.jar \
$(IMAGES_OUTPUTDIR)/lib/resources.jar \
$(IMAGES_OUTPUTDIR)/lib/jconsole.jar \
@@ -140,7 +140,7 @@
$(PROFILE_1_JRE_BIN_FILES) \
$(PROFILE_2_JRE_BIN_FILES) \
$(PROFILE_3_JRE_BIN_FILES) \
- $(PROFILE_4_JRE_BIN_FILES)
+ $(FULL_JRE_BIN_FILES)
NOT_JRE_BIN_FILES := $(filter-out $(ALL_JRE_BIN_FILES), $(NEW_ALL_BIN_LIST))
@@ -149,18 +149,18 @@
NOT_JRE_BIN_FILES += \
$(PROFILE_2_JRE_BIN_FILES) \
$(PROFILE_3_JRE_BIN_FILES) \
- $(PROFILE_4_JRE_BIN_FILES)
+ $(FULL_JRE_BIN_FILES)
endif
ifeq ($(PROFILE), profile_2)
NOT_JRE_BIN_FILES += \
$(PROFILE_3_JRE_BIN_FILES) \
- $(PROFILE_4_JRE_BIN_FILES)
+ $(FULL_JRE_BIN_FILES)
endif
ifeq ($(PROFILE), profile_3)
NOT_JRE_BIN_FILES += \
- $(PROFILE_4_JRE_BIN_FILES)
+ $(FULL_JRE_BIN_FILES)
endif
NOT_JRE_BIN_FILES := $(addprefix $(JDK_OUTPUTDIR)/bin/, $(NOT_JRE_BIN_FILES))
@@ -173,7 +173,7 @@
$(PROFILE_1_JRE_LIB_FILES) \
$(PROFILE_2_JRE_LIB_FILES) \
$(PROFILE_3_JRE_LIB_FILES) \
- $(PROFILE_4_JRE_LIB_FILES)
+ $(FULL_JRE_LIB_FILES)
NOT_JRE_LIB_FILES := $(filter-out $(ALL_JRE_LIB_FILES), $(NEW_ALL_LIB_LIST))
@@ -189,18 +189,18 @@
NOT_JRE_LIB_FILES += \
$(PROFILE_2_JRE_LIB_FILES) \
$(PROFILE_3_JRE_LIB_FILES) \
- $(PROFILE_4_JRE_LIB_FILES)
+ $(FULL_JRE_LIB_FILES)
endif
ifeq ($(PROFILE), profile_2)
NOT_JRE_LIB_FILES += \
$(PROFILE_3_JRE_LIB_FILES) \
- $(PROFILE_4_JRE_LIB_FILES)
+ $(FULL_JRE_LIB_FILES)
endif
ifeq ($(PROFILE), profile_3)
NOT_JRE_LIB_FILES += \
- $(PROFILE_4_JRE_LIB_FILES)
+ $(FULL_JRE_LIB_FILES)
endif
# Exclude the custom jar files as these will be added back via a special rule
@@ -279,13 +279,13 @@
ifeq ($(PROFILE), profile_1)
RT_JAR_EXCLUDES += \
- $(PROFILE_1_RTJAR_EXCLUDE_TYPES) \
+ $(call class_list, $(PROFILE_1_RTJAR_EXCLUDE_TYPES)) \
$(PROFILE_2_RTJAR_INCLUDE_PACKAGES) \
$(call class_list, $(PROFILE_2_RTJAR_INCLUDE_TYPES)) \
$(PROFILE_3_RTJAR_INCLUDE_PACKAGES) \
$(call class_list, $(PROFILE_3_RTJAR_INCLUDE_TYPES)) \
- $(PROFILE_4_RTJAR_INCLUDE_PACKAGES) \
- $(call class_list, $(PROFILE_4_RTJAR_INCLUDE_TYPES))
+ $(FULL_JRE_RTJAR_INCLUDE_PACKAGES) \
+ $(call class_list, $(FULL_JRE_RTJAR_INCLUDE_TYPES))
RT_JAR_INCLUDE_TYPES := \
$(call class_list, $(PROFILE_1_RTJAR_INCLUDE_TYPES))
PROFILE_INCLUDE_METAINF_SERVICES := \
@@ -293,11 +293,11 @@
endif
ifeq ($(PROFILE), profile_2)
RT_JAR_EXCLUDES += \
- $(PROFILE_2_RTJAR_EXCLUDE_TYPES) \
+ $(call class_list, $(PROFILE_2_RTJAR_EXCLUDE_TYPES)) \
$(PROFILE_3_RTJAR_INCLUDE_PACKAGES) \
$(call class_list, $(PROFILE_3_RTJAR_INCLUDE_TYPES)) \
- $(PROFILE_4_RTJAR_INCLUDE_PACKAGES) \
- $(call class_list, $(PROFILE_4_RTJAR_INCLUDE_TYPES))
+ $(FULL_JRE_RTJAR_INCLUDE_PACKAGES) \
+ $(call class_list, $(FULL_JRE_RTJAR_INCLUDE_TYPES))
RT_JAR_INCLUDE_TYPES := \
$(call class_list, $(PROFILE_1_RTJAR_INCLUDE_TYPES)) \
$(call class_list, $(PROFILE_2_RTJAR_INCLUDE_TYPES))
@@ -307,9 +307,9 @@
endif
ifeq ($(PROFILE), profile_3)
RT_JAR_EXCLUDES += \
- $(PROFILE_3_RTJAR_EXCLUDE_TYPES) \
- $(PROFILE_4_RTJAR_INCLUDE_PACKAGES) \
- $(call class_list, $(PROFILE_4_RTJAR_INCLUDE_TYPES))
+ $(call class_list, $(PROFILE_3_RTJAR_EXCLUDE_TYPES)) \
+ $(FULL_JRE_RTJAR_INCLUDE_PACKAGES) \
+ $(call class_list, $(FULL_JRE_RTJAR_INCLUDE_TYPES))
RT_JAR_INCLUDE_TYPES := \
$(call class_list, $(PROFILE_1_RTJAR_INCLUDE_TYPES)) \
$(call class_list, $(PROFILE_2_RTJAR_INCLUDE_TYPES)) \