diff options
| author |  Lukacs Berki <lberki@google.com> | 2015-07-30 15:38:25 +0000 |
|---|---|---|
| committer |  Damien Martin-Guillerez <dmarting@google.com> | 2015-07-30 15:43:41 +0000 |
| commit | 8647e5fbe93766338f164fc1957f38b83b7d6edc (patch) | |
| tree | 0760d57679eba037dc64decaf1529997257ae8de /src/main/java | |
| parent | b424f4316e3c06b758841d380f565fa9c3aacb2c (diff) | |
Make OutputFileConfiguredTarget create artifacts that are consistent with RuleContext#internalCreateOutputArtifact().
Fixes #351.
--
MOS_MIGRATED_REVID=99478770
Diffstat (limited to 'src/main/java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/analysis/ConfiguredTargetFactory.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredTargetFactory.java b/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredTargetFactory.java index c5d7a671f2..1d2eb5bf58 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredTargetFactory.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredTargetFactory.java @@ -138,7 +138,9 @@ public final class ConfiguredTargetFactory { : configuration.getGenfilesDirectory(); ArtifactOwner owner = new ConfiguredTargetKey(rule.getLabel(), configuration.getArtifactOwnerConfiguration()); - PathFragment rootRelativePath = Util.getWorkspaceRelativePath(outputFile); + PathFragment rootRelativePath = + outputFile.getLabel().getPackageIdentifier().getPathFragment().getRelative( + outputFile.getLabel().getName()); Artifact result = isFileset ? artifactFactory.getFilesetArtifact(rootRelativePath, root, owner) : artifactFactory.getDerivedArtifact(rootRelativePath, root, owner); |