Merge
authorduke
Wed, 05 Jul 2017 16:59:32 +0200
changeset 3615 22d6c90af3d6
parent 3614 8e014ad9c233 (current diff)
parent 3572 9a027a1c0510 (diff)
child 3643 22129b902bf6
Merge
--- a/.hgtags-top-repo	Fri Aug 21 20:16:58 2009 -0700
+++ b/.hgtags-top-repo	Wed Jul 05 16:59:32 2017 +0200
@@ -44,3 +44,4 @@
 c4523c6f82048f420bf0d57c4cd47976753b7d2c jdk7-b67
 e1b972ff53cd58f825791f8ed9b2deffd16e768c jdk7-b68
 82e6c820c51ac27882b77755d42efefdbf1dcda0 jdk7-b69
+175cb3fe615998d1004c6d3fd96e6d2e86b6772d jdk7-b70
--- a/make/Defs-internal.gmk	Fri Aug 21 20:16:58 2009 -0700
+++ b/make/Defs-internal.gmk	Wed Jul 05 16:59:32 2017 +0200
@@ -133,7 +133,11 @@
 
 # Do we build the source and openjdk binary plug bundles?
 BUNDLE_RULES = $(JDK_TOPDIR)/make/closed/bundles.gmk
-BUNDLE_RULES_AVAILABLE := $(call MkExists,$(BUNDLE_RULES))
+ifeq ($(SKIP_BUNDLES_BUILD), true)
+  BUNDLE_RULES_AVAILABLE := false
+else 
+  BUNDLE_RULES_AVAILABLE := $(call MkExists,$(BUNDLE_RULES))
+endif
 
 # Current things we do NOT build for OPENJDK
 ifdef OPENJDK