Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
authoryhuang
Tue, 15 Jan 2013 19:08:34 -0800
changeset 15142 9e19ecf00521
parent 15141 7dec023b824d (current diff)
parent 15138 316e13e3499c (diff)
child 15143 75c27b40c7b4
Merge
--- a/jdk/.hgtags	Sun Jan 13 18:45:43 2013 -0800
+++ b/jdk/.hgtags	Tue Jan 15 19:08:34 2013 -0800
@@ -193,3 +193,4 @@
 a8012d8d7e9c5035de0bdd4887dc9f7c54008f21 jdk8-b69
 a996b57e554198f4592a5f3c30f2f9f4075e545d jdk8-b70
 2a5af0f766d0acd68a81fb08fe11fd66795f86af jdk8-b71
+32a57e645e012a1f0665c075969ca598e0dbb948 jdk8-b72
--- a/jdk/makefiles/CreateJars.gmk	Sun Jan 13 18:45:43 2013 -0800
+++ b/jdk/makefiles/CreateJars.gmk	Tue Jan 15 19:08:34 2013 -0800
@@ -653,8 +653,11 @@
 		SUFFIXES:=.class,\
 		INCLUDES:= sun/security/mscapi,\
 		JAR:=$(SUNMSCAPI_JAR_UNSIGNED), \
+		MANIFEST:=$(JCE_MANIFEST), \
 		SKIP_METAINF:=true))
 
+$(SUNMSCAPI_JAR_UNSIGNED): $(JCE_MANIFEST)
+
 ifndef OPENJDK
     SUNMSCAPI_JAR_SRC := $(JDK_TOPDIR)/make/closed/tools/crypto/mscapi/sunmscapi.jar
     $(SUNMSCAPI_JAR_DST) : $(SUNMSCAPI_JAR_SRC)
jdk-sandbox