# HG changeset patch
# User lana
# Date 1489101337 0
# Node ID 5786369d744ba3743cef3a69113dee426ea8839d
# Parent  96be2f7d2bb441a3b7cb45932ff471fe9b3715b9# Parent  58bce7a42d4a27c43348a6126209bfcd74b32f38
Merge

diff -r 96be2f7d2bb4 -r 5786369d744b make/Images.gmk
--- a/make/Images.gmk	Thu Mar 09 21:35:17 2017 +0000
+++ b/make/Images.gmk	Thu Mar 09 23:15:37 2017 +0000
@@ -310,34 +310,6 @@
 endif # Windows
 
 ################################################################################
-# doc files
-
-JRE_DOC_LOCATION ?= $(JDK_TOPDIR)
-JDK_DOC_LOCATION ?= $(JDK_TOPDIR)
-
-JRE_DOC_TARGETS := $(addprefix $(JRE_IMAGE_DIR)/, $(JRE_DOC_FILES))
-JDK_DOC_TARGETS := $(addprefix $(JDK_IMAGE_DIR)/, $(JDK_DOC_FILES))
-
-# Processing license files from source area to image area
-# These are modified to have the platform specific EOL chars.
-define process-doc-file
-	$(call LogInfo, Processing $(patsubst $(OUTPUT_ROOT)/%,%,$@))
-	$(MKDIR) -p $(@D)
-	$(RM) $@
-	LC_ALL=C $(SED) 's/$$//g' $< > $@
-	$(CHMOD) 444 $@
-endef
-
-$(JRE_IMAGE_DIR)/%: $(JRE_DOC_LOCATION)/%
-	$(process-doc-file)
-
-$(JDK_IMAGE_DIR)/%: $(JDK_DOC_LOCATION)/%
-	$(process-doc-file)
-
-JRE_TARGETS += $(JRE_DOC_TARGETS)
-JDK_TARGETS += $(JDK_DOC_TARGETS)
-
-################################################################################
 # src.zip
 
 $(JDK_IMAGE_DIR)/lib/src.zip: $(SUPPORT_OUTPUTDIR)/src.zip
diff -r 96be2f7d2bb4 -r 5786369d744b make/Javadoc.gmk
--- a/make/Javadoc.gmk	Thu Mar 09 21:35:17 2017 +0000
+++ b/make/Javadoc.gmk	Thu Mar 09 23:15:37 2017 +0000
@@ -357,9 +357,7 @@
 $(eval $(call SetupJavadocGeneration, docletapi, \
     MODULES := jdk.javadoc, \
     PACKAGES := \
-        jdk.javadoc.doclet \
-        jdk.javadoc.doclet.taglet \
-        jdk.javadoc.doclets, \
+        jdk.javadoc.doclet, \
     API_ROOT := jdk, \
     DEST_DIR := javadoc/doclet, \
     TITLE := Doclet API, \