Strict proto deps: handle direct protos in external repositories.

RELNOTES: None

PiperOrigin-RevId: 151786403

1 files changed, 21 insertions, 12 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoCompileActionBuilder.java b/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoCompileActionBuilder.java
index fd1f95f02e..7ed003bcc2 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoCompileActionBuilder.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoCompileActionBuilder.java
@@ -341,27 +341,36 @@ public class ProtoCompileActionBuilder {
       ImmutableList.Builder<String> builder = ImmutableList.builder();
       for (Artifact artifact : transitiveImports) {
         builder.add(
-            "-I"
-                + artifact
-                    .getRootRelativePath()
-                    .relativeTo(
-                        artifact
-                            .getOwnerLabel()
-                            .getPackageIdentifier()
-                            .getRepository()
-                            .getPathUnderExecRoot())
-                + "="
-                + artifact.getExecPathString());
+            "-I" + getPathIgnoringRepository(artifact) + "=" + artifact.getExecPathString());
       }
       if (protosInDirectDependencies != null) {
         ArrayList<String> rootRelativePaths = new ArrayList<>();
         for (Artifact directDependency : protosInDirectDependencies) {
-          rootRelativePaths.add(directDependency.getRootRelativePathString());
+          rootRelativePaths.add(getPathIgnoringRepository(directDependency));
         }
         builder.add("--direct_dependencies=" + Joiner.on(":").join(rootRelativePaths));
       }
       return builder.build();
     }
+
+    /**
+     * Gets the artifact's path relative to the root, ignoring the external repository the artifact
+     * is at. For example, <code>
+     * //a:b.proto --> a/b.proto
+     * {@literal @}foo//a:b.proto --> a/b.proto
+     * </code>
+     */
+    private static String getPathIgnoringRepository(Artifact artifact) {
+      return artifact
+          .getRootRelativePath()
+          .relativeTo(
+              artifact
+                  .getOwnerLabel()
+                  .getPackageIdentifier()
+                  .getRepository()
+                  .getPathUnderExecRoot())
+          .toString();
+    }
   }
 
   /** Signifies that a prerequisite could not be satisfied. */