--- a/jdk/make/CompileDemos.gmk	Wed Aug 20 11:30:13 2014 -0700
+++ b/jdk/make/CompileDemos.gmk	Thu Aug 21 11:05:35 2014 +0200
@@ -29,9 +29,7 @@
 include MakeBase.gmk
 include JavaCompilation.gmk
 include NativeCompilation.gmk
-
-# Setup the java compilers for the JDK build.
-include SetupJava.gmk
+include SetupJavaCompilers.gmk
 
 # Prepare the find cache.
 $(eval $(call FillCacheFind, $(JDK_TOPDIR)/src))