aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/java_tools/buildjar/java/com/google/devtools/build/java/turbine/javac/JavacTurbine.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/java_tools/buildjar/java/com/google/devtools/build/java/turbine/javac/JavacTurbine.java')
-rw-r--r--src/java_tools/buildjar/java/com/google/devtools/build/java/turbine/javac/JavacTurbine.java8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/java_tools/buildjar/java/com/google/devtools/build/java/turbine/javac/JavacTurbine.java b/src/java_tools/buildjar/java/com/google/devtools/build/java/turbine/javac/JavacTurbine.java
index 1cc9391ca3..dd61582bd2 100644
--- a/src/java_tools/buildjar/java/com/google/devtools/build/java/turbine/javac/JavacTurbine.java
+++ b/src/java_tools/buildjar/java/com/google/devtools/build/java/turbine/javac/JavacTurbine.java
@@ -23,7 +23,6 @@ import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
import com.google.devtools.build.buildjar.javac.JavacOptions;
import com.google.devtools.build.buildjar.javac.plugins.dependency.DependencyModule;
-import com.google.devtools.build.buildjar.javac.plugins.dependency.DependencyModule.StrictJavaDeps;
import com.google.devtools.build.buildjar.javac.plugins.dependency.StrictJavaDepsPlugin;
import com.google.turbine.binder.ClassPathBinder;
import com.google.turbine.options.TurbineOptions;
@@ -115,8 +114,7 @@ public class JavacTurbine implements AutoCloseable {
// To avoid having to apply the same exemptions here, we just ignore strict deps errors
// and leave enforcement to JavaBuilder.
ImmutableSet<Path> platformJars = ImmutableSet.copyOf(asPaths(turbineOptions.bootClassPath()));
- DependencyModule dependencyModule =
- buildDependencyModule(turbineOptions, StrictJavaDeps.WARN, platformJars);
+ DependencyModule dependencyModule = buildDependencyModule(turbineOptions, platformJars);
if (sources.isEmpty()) {
// accept compilations with an empty source list for compatibility with JavaBuilder
@@ -261,15 +259,13 @@ public class JavacTurbine implements AutoCloseable {
private static DependencyModule buildDependencyModule(
TurbineOptions turbineOptions,
- StrictJavaDeps strictDepsMode,
ImmutableSet<Path> platformJars) {
DependencyModule.Builder dependencyModuleBuilder =
new DependencyModule.Builder()
.setReduceClasspath()
.setTargetLabel(turbineOptions.targetLabel().orNull())
.addDepsArtifacts(asPaths(turbineOptions.depsArtifacts()))
- .setPlatformJars(platformJars)
- .setStrictJavaDeps(strictDepsMode.toString());
+ .setPlatformJars(platformJars);
ImmutableSet.Builder<Path> directJars = ImmutableSet.builder();
for (String path : turbineOptions.directJars()) {
directJars.add(Paths.get(path));