From ae27c394e7766e1be3a73b2a55783219ac60165b Mon Sep 17 00:00:00 2001
From: Chris Hegarty <chegar@openjdk.org>
Date: Wed, 25 Jan 2017 14:10:43 +0000
Subject: [PATCH] 8173354: javadoc warning notice for types in Incubator
 Modules

Reviewed-by: erikj, michaelm
---
 make/Javadoc.gmk | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/make/Javadoc.gmk b/make/Javadoc.gmk
index a2ac21f03c7..aa2a8b96d8b 100644
--- a/make/Javadoc.gmk
+++ b/make/Javadoc.gmk
@@ -26,6 +26,7 @@ default: all
 
 include $(SPEC)
 include MakeBase.gmk
+include $(JDK_TOPDIR)/make/Tools.gmk
 
 ################################################################################
 
@@ -180,6 +181,8 @@ DEFAULT_JAVADOC_TAGS := \
     -tag see \
     -tag 'jvms:a:See <cite>The Java&trade; Virtual Machine Specification</cite>:' \
     -tag 'jls:a:See <cite>The Java&trade; Language Specification</cite>:' \
+    -taglet build.tools.taglet.Incubating \
+    -tagletpath $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
     #
 
 DEFAULT_JAVADOC_OPTIONS := -XDignore.symbol.file=true -use -keywords -notimestamp \
@@ -311,7 +314,7 @@ define SetupJavadocGenerationBody
   $1_INDEX_FILE := $$(JAVADOC_OUTPUTDIR)/$$($1_OUTPUT_DIRNAME)/index.html
 
   # Rule for actually running javadoc
-  $$($1_INDEX_FILE): $$($1_VARDEPS_FILE) $$($1_PACKAGE_DEPS) $$($1_DEPS)
+  $$($1_INDEX_FILE): $(BUILD_TOOLS_JDK) $$($1_VARDEPS_FILE) $$($1_PACKAGE_DEPS) $$($1_DEPS)
 	$$(call LogWarn, Generating Javadoc from $$(words $$($1_PACKAGES)) package(s) for $$($1_OUTPUT_DIRNAME))
 	$$(call MakeDir, $$(@D))
         ifneq ($$($1_PACKAGES_FILE), )
@@ -740,7 +743,7 @@ $(eval $(call IncludeCustomExtension, , Javadoc.gmk))
 
 ################################################################################
 
-docs-javadoc: $(TARGETS)
+docs-javadoc: $(BUILD_TOOLS_JDK) $(TARGETS)
 
 docs-copy: $(COPY_TARGETS)