Make the indirect dependency message show the correct label for external deps

Previously it would show the relative path within the external dep (e.g., in the
given test, "** Please add the following dependencies: x to //a:a").  Fixes
https://github.com/google/bazel/issues/112.

--
MOS_MIGRATED_REVID=91093258

1 files changed, 6 insertions, 0 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 7c6999b5d9..da57a8f970 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
@@ -359,6 +359,12 @@ public final class StrictJavaDepsPlugin extends BlazeJavaCompilerPlugin {
     if (replacement != null) {
       return replacement;
     }
+    int atIndex = target.indexOf('@');
+    if (atIndex != -1) {
+      // target starts with @@repo ('@' is escaped for the params file parsing) so one @ needs to
+      // be stripped.
+      target = target.substring(1);
+    }
     int colonIndex = target.indexOf(':');
     if (colonIndex == -1) {
       // No ':' in target, nothing to do.