diff options
| author |  Klaus Aehlig <aehlig@google.com> | 2017-06-09 12:00:39 +0200 |
|---|---|---|
| committer |  Jakob Buchgraber <buchgr@google.com> | 2017-06-09 13:31:57 +0200 |
| commit | 9a958522aaa2cc0374425fbf1a9a120a3c458a2a (patch) | |
| tree | e0d3c24415fc37825f49ebcaefc8e961925e419c /src/main/java/com/google | |
| parent | b8e5b4e098c0a7df26ea8aedf52ce2ca7331d528 (diff) | |
BEP: use full relative path as file name
The base names are not necessarily unique enough to identify which
artifact is being talked about.
Change-Id: Ic8ff78c8f26f98e0e9a2d558d03f4cf9ae9111c8
PiperOrigin-RevId: 158499210
Diffstat (limited to 'src/main/java/com/google')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/analysis/TargetCompleteEvent.java | 2 | ||||
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/runtime/NamedArtifactGroup.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/TargetCompleteEvent.java b/src/main/java/com/google/devtools/build/lib/analysis/TargetCompleteEvent.java index 1e167a3efa..0c91396cf4 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/TargetCompleteEvent.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/TargetCompleteEvent.java @@ -157,7 +157,7 @@ public final class TargetCompleteEvent for (ArtifactsInOutputGroup group : outputs) { if (group.areImportant()) { for (Artifact artifact : group.getArtifacts()) { - String name = artifact.getFilename(); + String name = artifact.getPath().relativeTo(artifact.getRoot().getPath()).getPathString(); String uri = converters.pathConverter().apply(artifact.getPath()); builder.addImportantOutput(File.newBuilder().setName(name).setUri(uri).build()); } diff --git a/src/main/java/com/google/devtools/build/lib/runtime/NamedArtifactGroup.java b/src/main/java/com/google/devtools/build/lib/runtime/NamedArtifactGroup.java index 601f39d4dd..227337b438 100644 --- a/src/main/java/com/google/devtools/build/lib/runtime/NamedArtifactGroup.java +++ b/src/main/java/com/google/devtools/build/lib/runtime/NamedArtifactGroup.java @@ -59,7 +59,7 @@ class NamedArtifactGroup implements BuildEvent { BuildEventStreamProtos.NamedSetOfFiles.newBuilder(); for (Artifact artifact : view.directs()) { BuildEventStreamProtos.File.Builder fileBuilder = BuildEventStreamProtos.File.newBuilder(); - String name = artifact.getFilename(); + String name = artifact.getPath().relativeTo(artifact.getRoot().getPath()).getPathString(); String uri = pathConverter.apply(artifact.getPath()); builder.addFiles(fileBuilder.setName(name).setUri(uri).build()); } |