--- a/jdk/make/gendata/GendataCommon.gmk	Wed Aug 20 11:30:13 2014 -0700
+++ b/jdk/make/gendata/GendataCommon.gmk	Thu Aug 21 11:05:35 2014 +0200
@@ -28,9 +28,7 @@
 include $(SPEC)
 include MakeBase.gmk
 include JavaCompilation.gmk
-
-# Setup the java compilers for the JDK build.
-include SetupJava.gmk
+include SetupJavaCompilers.gmk
 # We need the tools.
 include Tools.gmk