From cf582615487a3dd541f073479f2a26a9376887b2 Mon Sep 17 00:00:00 2001
From: Carmi Grushko <carmi@google.com>
Date: Wed, 21 Dec 2016 18:23:50 +0000
Subject: cc_proto_library can build proto_library's from remote repos.

--
PiperOrigin-RevId: 142676227
MOS_MIGRATED_REVID=142676227
---
 .../devtools/build/lib/rules/cpp/proto/CcProtoAspect.java    | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'src/main/java')

diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/proto/CcProtoAspect.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/proto/CcProtoAspect.java
index a0aaa5a2ce..da7e446bee 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/proto/CcProtoAspect.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/proto/CcProtoAspect.java
@@ -275,7 +275,17 @@ public class CcProtoAspect extends NativeAspectClass implements ConfiguredAspect
     }
 
     private void createProtoCompileAction(SupportData supportData, Collection<Artifact> outputs) {
-      String genfilesPath = ruleContext.getConfiguration().getGenfilesFragment().getPathString();
+      String genfilesPath =
+          ruleContext
+              .getConfiguration()
+              .getGenfilesFragment()
+              .getRelative(
+                  ruleContext
+                      .getLabel()
+                      .getPackageIdentifier()
+                      .getRepository()
+                      .getPathUnderExecRoot())
+              .getPathString();
 
       ImmutableList.Builder<ToolchainInvocation> invocations = ImmutableList.builder();
       invocations.add(
-- 
cgit v1.2.3