1 files changed, 2 insertions, 12 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaConfigurationLoader.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaConfigurationLoader.java
index fb72792bba..18076eea9d 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaConfigurationLoader.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaConfigurationLoader.java
@@ -20,7 +20,6 @@ import com.google.devtools.build.lib.analysis.config.ConfigurationEnvironment;
 import com.google.devtools.build.lib.analysis.config.ConfigurationFragmentFactory;
 import com.google.devtools.build.lib.analysis.config.FragmentOptions;
 import com.google.devtools.build.lib.analysis.config.InvalidConfigurationException;
-import com.google.devtools.build.lib.rules.java.JavaConfiguration.JavaClasspathMode;
 
 /**
  * A loader that creates JavaConfiguration instances based on JavaBuilder configurations and
@@ -32,19 +31,10 @@ public class JavaConfigurationLoader implements ConfigurationFragmentFactory {
     return ImmutableSet.<Class<? extends FragmentOptions>>of(JavaOptions.class);
   }
 
-
   @Override
   public JavaConfiguration create(ConfigurationEnvironment env, BuildOptions buildOptions)
-      throws InvalidConfigurationException, InterruptedException {
-    JavaOptions javaOptions = buildOptions.get(JavaOptions.class);
-    return create(javaOptions);
-  }
-
-  private JavaConfiguration create(JavaOptions javaOptions)
-      throws InvalidConfigurationException {
-    boolean generateJavaDeps =
-        javaOptions.javaDeps || javaOptions.javaClasspath != JavaClasspathMode.OFF;
-    return new JavaConfiguration(generateJavaDeps, javaOptions.jvmOpts, javaOptions);
+    throws InvalidConfigurationException {
+    return new JavaConfiguration(buildOptions.get(JavaOptions.class));
   }
 
   @Override