changeset 425:bbe009987085

Merge
author asaha
date Fri, 24 Jun 2011 17:34:02 -0700
parents d91364304d7c 3ac30b385287
children 34451dc0580d
files
diffstat 1 files changed, 0 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/make/Defs-internal.gmk	Wed Jun 22 12:40:39 2011 -0700
+++ b/make/Defs-internal.gmk	Fri Jun 24 17:34:02 2011 -0700
@@ -261,12 +261,6 @@
 ifndef NO_DOCS
   # Default value (we want javadoc run)
   GENERATE_DOCS=true
-  # No DOCS build when JDK_UPDATE_VERSION set on non-OPENJDK builds
-  ifndef OPENJDK
-    ifdef JDK_UPDATE_VERSION
-      GENERATE_DOCS=false
-    endif
-  endif
   # If langtools, corba, jaxp, and jaxws are not being built, 
   #   a full jdk javadoc is not possible
   ifneq ($(BUILD_LANGTOOLS), true)