From 8c5749843ce6606870f5437bcb7fa8508c5367db Mon Sep 17 00:00:00 2001
From: David Holmes <dholmes@openjdk.org>
Date: Tue, 19 Mar 2013 06:01:14 -0400
Subject: [PATCH] 8009426: "profiles" target fails due to nashorn if "images"
 is not built first

Reviewed-by: alanb
---
 jdk/makefiles/CreateJars.gmk       | 4 ----
 jdk/makefiles/Profiles.gmk         | 3 +--
 jdk/makefiles/profile-includes.txt | 2 ++
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/jdk/makefiles/CreateJars.gmk b/jdk/makefiles/CreateJars.gmk
index 685215ae24b..61edcfa783d 100644
--- a/jdk/makefiles/CreateJars.gmk
+++ b/jdk/makefiles/CreateJars.gmk
@@ -76,8 +76,6 @@ $(eval $(call SetupArchive,BUILD_DNS_JAR,,\
 $(IMAGES_OUTPUTDIR)/lib/tzdb.jar: $(JDK_OUTPUTDIR)/lib/tzdb.jar
 	$(install-file)
 
-JARS += $(IMAGES_OUTPUTDIR)/lib/tzdb.jar 
-
 ##########################################################################################
 
 LOCALEDATA_INCLUDE_LOCALES := ar be bg ca cs da de el es et fi fr ga hi hr hu in is it \
@@ -1120,8 +1118,6 @@ endif
 $(IMAGES_OUTPUTDIR)/lib/ext/nashorn.jar: $(NASHORN_DIST)/nashorn.jar
 	$(install-file)
 
-JARS += $(IMAGES_OUTPUTDIR)/lib/ext/nashorn.jar
-
 ##########################################################################################
 
 -include $(CUSTOM_MAKE_DIR)/CreateJars.gmk
diff --git a/jdk/makefiles/Profiles.gmk b/jdk/makefiles/Profiles.gmk
index b4fb673ddf3..316d2d34329 100644
--- a/jdk/makefiles/Profiles.gmk
+++ b/jdk/makefiles/Profiles.gmk
@@ -84,7 +84,7 @@ FULL_JRE_JARS := \
 # The full set of "jar" files needed for a complete JDK (ct.sym and src.zip
 # are also included.)
 # Note we need to add back the regular form of all the custom profile jars e.g.
-# rt.jar and resources.jar
+# rt.jar and resources.jar that we filtered out above
 
 ALL_JARS := $(FULL_JRE_JARS) \
         $(IMAGES_OUTPUTDIR)/lib/rt.jar \
@@ -94,7 +94,6 @@ ALL_JARS := $(FULL_JRE_JARS) \
         $(IMAGES_OUTPUTDIR)/lib/tools.jar \
         $(IMAGES_OUTPUTDIR)/lib/ct.sym \
         $(IMAGES_OUTPUTDIR)/src.zip \
-        $(IMAGES_OUTPUTDIR)/lib/ext/cldrdata.jar \
         $(IMAGES_OUTPUTDIR)/lib/sa-jdi.jar
 
 ifeq ($(OPENJDK_TARGET_OS),solaris)
diff --git a/jdk/makefiles/profile-includes.txt b/jdk/makefiles/profile-includes.txt
index de506edfd0a..53453e3ded8 100644
--- a/jdk/makefiles/profile-includes.txt
+++ b/jdk/makefiles/profile-includes.txt
@@ -178,6 +178,7 @@ FULL_JRE_LIB_FILES := \
     cmm/sRGB.pf \
     ext/cldrdata.jar \
     ext/dnsns.jar \
+    ext/nashorn.jar \
     ext/sunec.jar \
     ext/sunpkcs11.jar \
     ext/zipfs.jar \
@@ -251,6 +252,7 @@ FULL_JRE_JAR_FILES := \
     charsets.jar \
     ext/cldrdata.jar \
     ext/dnsns.jar \
+    ext/nashorn.jar \
     ext/sunec.jar \
     ext/sunpkcs11.jar \
     ext/zipfs.jar