Enables support for compiling generated proto files (as in genrules).

--
MOS_MIGRATED_REVID=130755375

1 files changed, 10 insertions, 1 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ProtobufSupport.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ProtobufSupport.java
index 40c98124fd..d8efbfbf8a 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/ProtobufSupport.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ProtobufSupport.java
@@ -479,7 +479,7 @@ final class ProtobufSupport {
     // Sort the file names to make the remote action key independent of the precise deps structure.
     // compile_protos.py will sort the input list anyway.
     Iterable<Artifact> sorted = Ordering.natural().immutableSortedCopy(outputProtos);
-    return Artifact.joinExecPaths("\n", sorted);
+    return Artifact.joinRootRelativePaths("\n", sorted);
   }
 
   private CustomCommandLine getGenerationCommandLine(Artifact protoInputsFile) {
@@ -491,11 +491,20 @@ final class ProtobufSupport {
         .add(getWorkspaceRelativeOutputDir().getSafePathString())
         .add("--force")
         .add("--proto-root-dir")
+        .add(getGenfilesPathString())
+        .add("--proto-root-dir")
         .add(".")
         .addBeforeEachExecPath("--config", getPortableProtoFilters())
         .build();
   }
 
+  private String getGenfilesPathString() {
+    if (buildConfiguration != null) {
+      return buildConfiguration.getGenfilesDirectory().getExecPathString();
+    }
+    return ruleContext.getConfiguration().getGenfilesDirectory().getExecPathString();
+  }
+
   private PathFragment getWorkspaceRelativeOutputDir() {
     // Generate sources in a package-and-rule-scoped directory; adds both the
     // package-and-rule-scoped directory and the header-containing-directory to the include path