diff make/Defs-internal.gmk @ 286:6db0e6f221bd

7009969: Remove SKIP_OPENJDK_BUILD from top Makefile Reviewed-by: robilad
author ohair
date Wed, 05 Jan 2011 17:24:58 -0800
parents 024a6755895b
children ce02c0d73d6a
line wrap: on
line diff
--- a/make/Defs-internal.gmk	Tue Dec 28 15:52:09 2010 -0800
+++ b/make/Defs-internal.gmk	Wed Jan 05 17:24:58 2011 -0800
@@ -147,7 +147,7 @@
 endif
 
 
-# Do we build the source and openjdk binary plug bundles?
+# Do we build the source bundles?
 BUNDLE_RULES = $(JDK_TOPDIR)/make/closed/bundles.gmk
 ifeq ($(SKIP_BUNDLES_BUILD), true)
   BUNDLE_RULES_AVAILABLE := false
@@ -171,7 +171,6 @@
   ifndef SKIP_COMPARE_IMAGES
     SKIP_COMPARE_IMAGES = true
   endif
-  SKIP_OPENJDK_BUILD = true
 else
   
   # Various non-OPENJDK reasons to NOT build the deploy repository
@@ -187,21 +186,11 @@
     endif
   endif
 
-  ifndef SKIP_OPENJDK_BUILD
-    #SKIP_OPENJDK_BUILD = false
-    # Until 6675289 is resolved, or this feature is removed.
-    SKIP_OPENJDK_BUILD = true
-  endif
 endif
 ifndef SKIP_PRODUCT_BUILD
   SKIP_PRODUCT_BUILD = false
 endif
 
-# Solaris 64 bit builds are not complete enough to ever do this
-ifeq ($(PLATFORM)$(ARCH_DATA_MODEL),solaris64)
-  SKIP_OPENJDK_BUILD = true
-endif
-
 # Many reasons why we would want to skip the comparison to previous jdk
 ifndef SKIP_COMPARE_IMAGES
   ifeq ($(BUILD_JDK), false)