diff options
| author |  Carmi Grushko <carmi@google.com> | 2016-12-21 18:23:50 +0000 |
|---|---|---|
| committer |  Klaus Aehlig <aehlig@google.com> | 2016-12-22 09:55:15 +0000 |
| commit | cf582615487a3dd541f073479f2a26a9376887b2 (patch) | |
| tree | 626c3962dd4501830ab2232e6b1321c7628f5ff3 /src/main/java/com/google/devtools/build | |
| parent | 303e5bf9ae55dcb494b27d53a2bee30855d38949 (diff) | |
cc_proto_library can build proto_library's from remote repos.
--
PiperOrigin-RevId: 142676227
MOS_MIGRATED_REVID=142676227
Diffstat (limited to 'src/main/java/com/google/devtools/build')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/cpp/proto/CcProtoAspect.java | 12 |
1 files changed, 11 insertions, 1 deletions
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( |