diff options
| author |  pcloudy <pcloudy@google.com> | 2017-08-25 16:00:47 +0200 |
|---|---|---|
| committer |  Damien Martin-Guillerez <dmarting@google.com> | 2017-08-25 16:04:57 +0200 |
| commit | 9e3a3e2f6a16288febc74a4a3c9086c995f6aa5a (patch) | |
| tree | 1ae622a21c106c5e09ff220f281687c61520f0b0 /src/tools/launcher | |
| parent | 36fdbc737076064e07568f9d2c872d2115101852 (diff) | |
Prepend workspace name when finding Jar path by Rlocation
Fix https://github.com/bazelbuild/bazel/issues/3620
RELNOTES: None.
PiperOrigin-RevId: 166472158
Diffstat (limited to 'src/tools/launcher')
| -rw-r--r-- | src/tools/launcher/java_launcher.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/tools/launcher/java_launcher.cc b/src/tools/launcher/java_launcher.cc index b8c0bdbd43..24fca5866a 100644 --- a/src/tools/launcher/java_launcher.cc +++ b/src/tools/launcher/java_launcher.cc @@ -153,8 +153,7 @@ string JavaBinaryLauncher::CreateClasspathJar(const string& classpath) { // Create the command for generating classpath jar. // We pass the command to cmd.exe to use redirection for suppressing output. string manifest_jar_path = binary_base_path + "-classpath.jar"; - string jar_bin = this->Rlocation(this->GetLaunchInfoByKey(JAR_BIN_PATH), - /*need_workspace_name =*/false); + string jar_bin = this->Rlocation(this->GetLaunchInfoByKey(JAR_BIN_PATH)); vector<string> arguments; arguments.push_back("/c"); |