changeset 761:13d3e0c4d526

Merge
author asaha
date Wed, 22 May 2013 11:56:57 -0700
parents a06a68b49a5d 4ef57f592525
children 3b3e9157b840
files .hgtags
diffstat 2 files changed, 3 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Wed May 15 14:18:47 2013 -0700
+++ b/.hgtags	Wed May 22 11:56:57 2013 -0700
@@ -309,3 +309,4 @@
 3e3177719b43f732239d6d51e96d26ee18440960 jdk7u14-b22
 8c6e2197930c79f6beafd83181714cc817b83229 jdk7u40-b23
 5169c92728b54a4b5e9a41071f8bf8701d0fe1fa jdk7u40-b24
+f89fd7e2800c1c35b6c339f54780d5579bb30991 jdk7u40-b25
--- a/make/hotspot-rules.gmk	Wed May 15 14:18:47 2013 -0700
+++ b/make/hotspot-rules.gmk	Wed May 22 11:56:57 2013 -0700
@@ -105,6 +105,8 @@
   HOTSPOT_BUILD_ARGUMENTS += ZIP_DEBUGINFO_FILES="$(ZIP_DEBUGINFO_FILES)"
 endif
 
+-include ${JDK_TOPDIR}/make/closed/common/Defs.gmk
+
 hotspot-build::
 	$(MKDIR) -p $(HOTSPOT_OUTPUTDIR)
 	$(MKDIR) -p $(HOTSPOT_EXPORT_PATH)