diff options
| author |  ulfjack <ulfjack@google.com> | 2017-04-10 08:23:18 +0000 |
|---|---|---|
| committer |  Jakob Buchgraber <buchgr@google.com> | 2017-04-10 11:48:49 +0200 |
| commit | 25b17db6c159abc112e89ca1e4dce622be1f147b (patch) | |
| tree | 15991d880a9511d61e50d1606f6a03e566abe928 /src/main/java | |
| parent | 6ac454a99672547a8d9709e326e573fd51b6bf8a (diff) | |
Fix the SpawnInputExpander to compute the manifest path correctly
PiperOrigin-RevId: 152663008
Diffstat (limited to 'src/main/java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/exec/SpawnInputExpander.java | 3 |
1 files changed, 2 insertions, 1 deletions
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<PathFragment, ActionInput> 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())); } |