From 93a253535c326a5b437139325c1a2d12ecc84332 Mon Sep 17 00:00:00 2001 From: Athijegannathan Sundararajan Date: Mon, 16 May 2016 14:50:43 +0530 Subject: [PATCH 1/2] 8156914: jlink API minor cleanups Reviewed-by: mchung --- make/Javadoc.gmk | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/make/Javadoc.gmk b/make/Javadoc.gmk index d1e85b4b746..5cff3c46bdd 100644 --- a/make/Javadoc.gmk +++ b/make/Javadoc.gmk @@ -1634,9 +1634,7 @@ JLINK_PLUGIN_DOCTITLE := JLink Plugin API - EXPERIMENTAL JLINK_PLUGIN_WINDOWTITLE := JLink Plugin API - EXPERIMENTAL JLINK_PLUGIN_HEADER := JLink Plugin API - EXPERIMENTAL JLINK_PLUGIN_BOTTOM := $(call CommonBottom,$(JLINK_PLUGIN_FIRST_COPYRIGHT_YEAR)) -JLINK_PLUGIN_PKGS = jdk.tools.jlink \ - jdk.tools.jlink.builder \ - jdk.tools.jlink.plugin +JLINK_PLUGIN_PKGS = jdk.tools.jlink.plugin JLINK_PLUGIN_INDEX_HTML = $(JLINK_PLUGIN_DOCDIR)/index.html JLINK_PLUGIN_OPTIONS_FILE = $(DOCSTMPDIR)/jlinkplugins.options From 7750aa7661b1c59670d0da173e1f0d22eb51b737 Mon Sep 17 00:00:00 2001 From: Athijegannathan Sundararajan Date: Mon, 16 May 2016 20:51:01 +0530 Subject: [PATCH 2/2] 8156847: jdk.dynalink package is shown under "Other Packages" section Reviewed-by: jlaskey --- make/Javadoc.gmk | 1 - 1 file changed, 1 deletion(-) diff --git a/make/Javadoc.gmk b/make/Javadoc.gmk index 5cff3c46bdd..8804cff3f68 100644 --- a/make/Javadoc.gmk +++ b/make/Javadoc.gmk @@ -1437,7 +1437,6 @@ $(DYNALINKAPI_OPTIONS_FILE): $(call OptionPair,-windowtitle,$(DYNALINKAPI_WINDOWTITLE) $(DRAFT_WINTITLE)); \ $(call OptionPair,-header,$(DYNALINKAPI_HEADER)$(DRAFT_HEADER)) ; \ $(call OptionPair,-bottom,$(DYNALINKAPI_BOTTOM)$(DRAFT_BOTTOM)) ; \ - $(call OptionTrip,-group,$(DYNALINKAPI_GROUPNAME),$(DYNALINKAPI_REGEXP)); \ $(call OptionTrip,-linkoffline,$(DYNALINKAPI2COREAPI),$(COREAPI_DOCSDIR)/); \ ) >> $@