From ada23c9fef9b6e1b3cd5d3f92da06d7d4da0ed19 Mon Sep 17 00:00:00 2001
From: Claes Redestad <redestad@openjdk.org>
Date: Fri, 17 Feb 2017 18:12:53 +0100
Subject: [PATCH] 8175026: Capture build-time parameters to
 --generate-jli-classes

Reviewed-by: mchung, ihse
---
 make/GenerateLinkOptData.gmk | 10 +++++++++-
 make/Images.gmk              |  2 +-
 make/Main.gmk                |  2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/make/GenerateLinkOptData.gmk b/make/GenerateLinkOptData.gmk
index 43e388ddab4..f754ed36a8c 100644
--- a/make/GenerateLinkOptData.gmk
+++ b/make/GenerateLinkOptData.gmk
@@ -49,7 +49,7 @@ TARGETS += $(CLASSLIST_JAR)
 
 LINK_OPT_DIR := $(SUPPORT_OUTPUTDIR)/link_opt
 CLASSLIST_FILE := $(LINK_OPT_DIR)/classlist
-JLI_TRACE_FILE := $(LINK_OPT_DIR)/jli_trace.out
+JLI_TRACE_FILE := $(LINK_OPT_DIR)/default_jli_trace.txt
 
 # If an external buildjdk has been supplied, we don't build a separate interim
 # image, so just use the external build jdk instead.
@@ -83,6 +83,14 @@ $(eval $(call SetupCopyFiles, COPY_CLASSLIST, \
 
 TARGETS += $(COPY_CLASSLIST)
 
+# Copy the default_jli_trace.txt file into jdk.jlink
+$(eval $(call SetupCopyFiles, COPY_JLI_TRACE, \
+    FILES := $(JLI_TRACE_FILE), \
+    DEST := $(JDK_OUTPUTDIR)/modules/jdk.jlink/jdk/tools/jlink/internal/plugins, \
+))
+
+TARGETS += $(COPY_JLI_TRACE)
+
 ################################################################################
 
 all: $(TARGETS)
diff --git a/make/Images.gmk b/make/Images.gmk
index 09740cb53d9..2272b427dab 100644
--- a/make/Images.gmk
+++ b/make/Images.gmk
@@ -105,7 +105,7 @@ JLINK_ORDER_RESOURCES := **module-info.class
 JLINK_JLI_CLASSES :=
 ifeq ($(ENABLE_GENERATE_CLASSLIST), true)
   JLINK_ORDER_RESOURCES += @$(SUPPORT_OUTPUTDIR)/link_opt/classlist
-  JLINK_JLI_CLASSES := --generate-jli-classes=@$(SUPPORT_OUTPUTDIR)/link_opt/jli_trace.out
+  JLINK_JLI_CLASSES := --generate-jli-classes=@$(SUPPORT_OUTPUTDIR)/link_opt/default_jli_trace.txt
 endif
 JLINK_ORDER_RESOURCES += \
     /java.base/java/** \
diff --git a/make/Main.gmk b/make/Main.gmk
index 18cac690f96..280673e5f4e 100644
--- a/make/Main.gmk
+++ b/make/Main.gmk
@@ -727,7 +727,7 @@ else
     generate-link-opt-data: buildtools-jdk
 
     # The generated classlist needs to go into java.base-jmod.
-    java.base-jmod jdk-image jre-image: generate-link-opt-data
+    java.base-jmod jdk.jlink-jmod jdk-image jre-image: generate-link-opt-data
   endif
 
   release-file: create-source-revision-tracker