From 220d650b3f47712a5b82748141f3381075c35c80 Mon Sep 17 00:00:00 2001 From: Klaus Aehlig Date: Fri, 9 Feb 2018 06:54:21 -0800 Subject: distdir: also accept relative path ...and interpret them relative to the workspace directory. Change-Id: I31a0ce3a179356c798f00c4218ddd22e16b256a3 PiperOrigin-RevId: 185136432 --- .../com/google/devtools/build/lib/bazel/BazelRepositoryModule.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/main/java/com/google/devtools/build') diff --git a/src/main/java/com/google/devtools/build/lib/bazel/BazelRepositoryModule.java b/src/main/java/com/google/devtools/build/lib/bazel/BazelRepositoryModule.java index d535867c81..4d2c0328bd 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/BazelRepositoryModule.java +++ b/src/main/java/com/google/devtools/build/lib/bazel/BazelRepositoryModule.java @@ -218,7 +218,11 @@ public class BazelRepositoryModule extends BlazeModule { repoOptions .experimentalDistdir .stream() - .map(filesystem::getPath) + .map( + path -> + path.isAbsolute() + ? filesystem.getPath(path) + : env.getBlazeWorkspace().getWorkspace().getRelative(path)) .collect(Collectors.toList())); } -- cgit v1.2.3