diff options
| author |  cushon <cushon@google.com> | 2018-07-27 11:50:37 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-07-27 11:52:09 -0700 |
| commit | bc9b35b1856b1bd1fc565a8ee3b6de278f6e5c0a (patch) | |
| tree | 9beb13396d7ee2f2775e5a65ad011a43c275349a /src/java_tools/buildjar/java/com/google/devtools | |
| parent | 129c3e2fd3dfdfe1cd312826988f0944bdd69236 (diff) | |
Skip strict deps suggested fix commands with strict deps disabled
instead of just skipping the add dep errors.
RELNOTES: follow-up to https://github.com/bazelbuild/bazel/commit/1ac359743176e659e9c7472645e3142f3c44b9e8
PiperOrigin-RevId: 206350053
Diffstat (limited to 'src/java_tools/buildjar/java/com/google/devtools')
| -rw-r--r-- | src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/plugins/dependency/StrictJavaDepsPlugin.java | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/plugins/dependency/StrictJavaDepsPlugin.java b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/plugins/dependency/StrictJavaDepsPlugin.java index 60ec10c581..d16ed69fac 100644 --- a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/plugins/dependency/StrictJavaDepsPlugin.java +++ b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/plugins/dependency/StrictJavaDepsPlugin.java @@ -22,6 +22,7 @@ import com.google.auto.value.AutoValue; import com.google.common.collect.ImmutableSet; import com.google.devtools.build.buildjar.JarOwner; import com.google.devtools.build.buildjar.javac.plugins.BlazeJavaCompilerPlugin; +import com.google.devtools.build.buildjar.javac.plugins.dependency.DependencyModule.StrictJavaDeps; import com.google.devtools.build.lib.view.proto.Deps; import com.google.devtools.build.lib.view.proto.Deps.Dependency; import com.sun.tools.javac.code.Flags; @@ -200,9 +201,11 @@ public final class StrictJavaDepsPlugin extends BlazeJavaCompilerPlugin { // suggest private build labels. .map(owner -> owner.withLabel(owner.label().map(label -> canonicalizeTarget(label)))) .collect(toImmutableSet()); - errWriter.print( - dependencyModule.getFixMessage().get(canonicalizedMissing, canonicalizedLabel)); - dependencyModule.setHasMissingTargets(); + if (dependencyModule.getStrictJavaDeps() != StrictJavaDeps.OFF) { + errWriter.print( + dependencyModule.getFixMessage().get(canonicalizedMissing, canonicalizedLabel)); + dependencyModule.setHasMissingTargets(); + } } } |