From 25b17db6c159abc112e89ca1e4dce622be1f147b Mon Sep 17 00:00:00 2001 From: ulfjack Date: Mon, 10 Apr 2017 08:23:18 +0000 Subject: Fix the SpawnInputExpander to compute the manifest path correctly PiperOrigin-RevId: 152663008 --- .../java/com/google/devtools/build/lib/exec/SpawnInputExpander.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/main/java') diff --git a/src/main/java/com/google/devtools/build/lib/exec/SpawnInputExpander.java b/src/main/java/com/google/devtools/build/lib/exec/SpawnInputExpander.java index 351f8c7e10..ef538a0c2d 100644 --- a/src/main/java/com/google/devtools/build/lib/exec/SpawnInputExpander.java +++ b/src/main/java/com/google/devtools/build/lib/exec/SpawnInputExpander.java @@ -113,7 +113,8 @@ public class SpawnInputExpander { Map inputMappings, Artifact manifest, String workspaceName) throws IOException { Path file = manifest.getRoot().getPath().getRelative( - AnalysisUtils.getManifestPathFromFilesetPath(manifest.getExecPath()).getPathString()); + AnalysisUtils.getManifestPathFromFilesetPath( + manifest.getRootRelativePath()).getPathString()); FileSystemUtils.asByteSource(file).asCharSource(UTF_8) .readLines(new ManifestLineProcessor(inputMappings, workspaceName, manifest.getExecPath())); } -- cgit v1.2.3