--- a/jdk/make/gensrc/GensrcExceptions.gmk Sun Aug 17 15:56:32 2014 +0100
+++ b/jdk/make/gensrc/GensrcExceptions.gmk Wed Jul 05 19:55:15 2017 +0200
@@ -26,9 +26,9 @@
GENSRC_EXCEPTIONS :=
GENSRC_EXCEPTIONS_TMP := $(JDK_OUTPUTDIR)/gensrc
-GENSRC_EXCEPTIONS_DST := $(JDK_OUTPUTDIR)/gensrc/java/nio
+GENSRC_EXCEPTIONS_DST := $(JDK_OUTPUTDIR)/gensrc/java.base/java/nio
-GENSRC_EXCEPTIONS_SRC := $(JDK_TOPDIR)/src/share/classes/java/nio
+GENSRC_EXCEPTIONS_SRC := $(JDK_TOPDIR)/src/java.base/share/classes/java/nio
GENSRC_EXCEPTIONS_CMD := $(JDK_TOPDIR)/make/scripts/genExceptions.sh
GENSRC_EXCEPTIONS_SRC_DIRS := . charset channels
@@ -51,5 +51,6 @@
$(TOUCH) $@
GENSRC_EXCEPTIONS += $(foreach D,$(GENSRC_EXCEPTIONS_SRC_DIRS),$(GENSRC_EXCEPTIONS_DST)/_the.$(D).marker)
+GENSRC_JAVA_BASE += $(GENSRC_EXCEPTIONS)
-$(GENSRC_EXCEPTIONS): $(BUILD_TOOLS)
+$(GENSRC_EXCEPTIONS): $(BUILD_TOOLS_JDK)