changeset 13529:6b91249d23c3

XaddExports usages should include target in the build
author chegar
date Mon, 27 Jul 2015 16:12:03 +0100
parents 2d756bf68301
children dbe9fdf9bf35
files make/ModuleTools.gmk make/Tools.gmk make/gendata/GendataBreakIterator.gmk
diffstat 3 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/make/ModuleTools.gmk	Mon Jul 27 15:37:25 2015 +0100
+++ b/make/ModuleTools.gmk	Mon Jul 27 16:12:03 2015 +0100
@@ -36,12 +36,12 @@
     INCLUDES := build/tools/deps \
                 build/tools/jigsaw, \
     BIN := $(TOOLS_CLASSES_DIR), \
-    ADD_JAVAC_FLAGS := -XaddExports:jdk.jdeps/com.sun.tools.classfile ))
+    ADD_JAVAC_FLAGS := -XaddExports:jdk.jdeps/com.sun.tools.classfile=ALL-UNNAMED ))
 
 
 TOOL_GENGRAPHS := $(BUILD_JAVA) -esa -ea -cp $(TOOLS_CLASSES_DIR) \
     build.tools.jigsaw.GenGraphs
 
 TOOL_MODULESUMMARY := $(BUILD_JAVA) -esa -ea -cp $(TOOLS_CLASSES_DIR) \
-    -XaddExports:jdk.jdeps/com.sun.tools.classfile \
+    -XaddExports:jdk.jdeps/com.sun.tools.classfile=ALL-UNNAMED \
     build.tools.jigsaw.ModuleSummary
--- a/make/Tools.gmk	Mon Jul 27 15:37:25 2015 +0100
+++ b/make/Tools.gmk	Mon Jul 27 16:12:03 2015 +0100
@@ -61,7 +61,7 @@
     build.tools.buildmetaindex.BuildMetaIndex
 
 ifeq ($(BOOT_JDK_MODULAR), true)
-  COMPILEFONTCONFIG_ADD_EXPORTS := -XaddExports:java.desktop/sun.awt
+  COMPILEFONTCONFIG_ADD_EXPORTS := -XaddExports:java.desktop/sun.awt=ALL-UNNAMED
 endif
 
 TOOL_COMPILEFONTCONFIG = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
--- a/make/gendata/GendataBreakIterator.gmk	Mon Jul 27 15:37:25 2015 +0100
+++ b/make/gendata/GendataBreakIterator.gmk	Mon Jul 27 16:12:03 2015 +0100
@@ -64,9 +64,9 @@
 ifeq ($(BOOT_JDK_MODULAR), true)
   BREAK_ITERATOR_BOOTCLASSPATH := -Xoverride:$(BREAK_ITERATOR_CLASSES) \
       -XaddExports:$(subst $(SPACE),$(COMMA),$(strip \
-          java.base/sun.text \
-          java.base/sun.text.resources \
-          jdk.localedata/sun.text.resources.th \
+          java.base/sun.text=ALL-UNNAMED \
+          java.base/sun.text.resources=ALL-UNNAMED \
+          jdk.localedata/sun.text.resources.th=ALL-UNNAMED \
       ))
 else
   BREAK_ITERATOR_BOOTCLASSPATH := -Xbootclasspath/p:$(call CreatePath, \