Merge jdk7-b71

Mon, 24 Aug 2009 22:39:34 -0700

author
tbell
date
Mon, 24 Aug 2009 22:39:34 -0700
changeset 123
4c36e9853dda
parent 121
de7a3e98c159
parent 122
d8b49b53d8cf
child 124
378f57273f09
child 128
e76b72562a98

Merge

     1.1 --- a/make/Defs-internal.gmk	Thu Aug 20 11:20:04 2009 -0700
     1.2 +++ b/make/Defs-internal.gmk	Mon Aug 24 22:39:34 2009 -0700
     1.3 @@ -133,7 +133,11 @@
     1.4  
     1.5  # Do we build the source and openjdk binary plug bundles?
     1.6  BUNDLE_RULES = $(JDK_TOPDIR)/make/closed/bundles.gmk
     1.7 -BUNDLE_RULES_AVAILABLE := $(call MkExists,$(BUNDLE_RULES))
     1.8 +ifeq ($(SKIP_BUNDLES_BUILD), true)
     1.9 +  BUNDLE_RULES_AVAILABLE := false
    1.10 +else 
    1.11 +  BUNDLE_RULES_AVAILABLE := $(call MkExists,$(BUNDLE_RULES))
    1.12 +endif
    1.13  
    1.14  # Current things we do NOT build for OPENJDK
    1.15  ifdef OPENJDK

mercurial