diff options
author | 2018-01-12 01:30:27 -0800 | |
---|---|---|
committer | 2018-01-12 08:18:04 -0800 | |
commit | 3e379d1479b2de6118b16aa33f6b9b6fd4ac6ab0 (patch) | |
tree | 452f04efb4882eb683d7d4dc88a0b5068b6fae48 | |
parent | 5ffcd12ec9cb02b7d24c39cfd74f24e459671788 (diff) |
Simplify root relative path calculation.
This is a first-class artifact concept. No need to go the long way to get this path.
PiperOrigin-RevId: 181717016
-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 c1e7805bf7..ecad21968d 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 @@ -175,7 +175,7 @@ public final class TargetCompleteEvent BuildEventConverters converters, Iterable<Artifact> artifacts) { for (Artifact artifact : artifacts) { - String name = artifact.getPath().relativeTo(artifact.getRoot().getPath()).getPathString(); + String name = artifact.getRootRelativePathString(); 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 227337b438..f20d140fb1 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.getPath().relativeTo(artifact.getRoot().getPath()).getPathString(); + String name = artifact.getRootRelativePathString(); String uri = pathConverter.apply(artifact.getPath()); builder.addFiles(fileBuilder.setName(name).setUri(uri).build()); } |