1.1 --- a/make/Defs-internal.gmk Tue Dec 28 15:52:09 2010 -0800
1.2 +++ b/make/Defs-internal.gmk Wed Jan 05 17:24:58 2011 -0800
1.3 @@ -147,7 +147,7 @@
1.4 endif
1.5
1.6
1.7 -# Do we build the source and openjdk binary plug bundles?
1.8 +# Do we build the source bundles?
1.9 BUNDLE_RULES = $(JDK_TOPDIR)/make/closed/bundles.gmk
1.10 ifeq ($(SKIP_BUNDLES_BUILD), true)
1.11 BUNDLE_RULES_AVAILABLE := false
1.12 @@ -171,7 +171,6 @@
1.13 ifndef SKIP_COMPARE_IMAGES
1.14 SKIP_COMPARE_IMAGES = true
1.15 endif
1.16 - SKIP_OPENJDK_BUILD = true
1.17 else
1.18
1.19 # Various non-OPENJDK reasons to NOT build the deploy repository
1.20 @@ -187,21 +186,11 @@
1.21 endif
1.22 endif
1.23
1.24 - ifndef SKIP_OPENJDK_BUILD
1.25 - #SKIP_OPENJDK_BUILD = false
1.26 - # Until 6675289 is resolved, or this feature is removed.
1.27 - SKIP_OPENJDK_BUILD = true
1.28 - endif
1.29 endif
1.30 ifndef SKIP_PRODUCT_BUILD
1.31 SKIP_PRODUCT_BUILD = false
1.32 endif
1.33
1.34 -# Solaris 64 bit builds are not complete enough to ever do this
1.35 -ifeq ($(PLATFORM)$(ARCH_DATA_MODEL),solaris64)
1.36 - SKIP_OPENJDK_BUILD = true
1.37 -endif
1.38 -
1.39 # Many reasons why we would want to skip the comparison to previous jdk
1.40 ifndef SKIP_COMPARE_IMAGES
1.41 ifeq ($(BUILD_JDK), false)
