Use Artifact#getRunfilesPath for Windows Java exe launcher classpath …

…generation. PiperOrigin-RevId: 345675167
bazelbuild · Dec 4, 2020 · 11d85c0 · 11d85c0
1 parent c0809f7
commit 11d85c0
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/src/main/java/com/google/devtools/build/lib/actions/Artifact.java b/src/main/java/com/google/devtools/build/lib/actions/Artifact.java
@@ -1340,8 +1340,8 @@ public SourceArtifact deserialize(DeserializationContext context, CodedInputStre
   public static final Function<Artifact, String> ROOT_RELATIVE_PATH_STRING =
       artifact -> artifact.getRootRelativePath().getPathString();
 
-  public static final Function<Artifact, String> OUTPUT_DIR_RELATIVE_PATH_STRING =
-      artifact -> artifact.getOutputDirRelativePath(false).getPathString();
+  public static final Function<Artifact, String> RUNFILES_PATH_STRING =
+      artifact -> artifact.getRunfilesPath().getPathString();
 
   /**
    * Converts a collection of artifacts into execution-time path strings, and

diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaSemantics.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaSemantics.java
@@ -435,7 +435,7 @@ private static Artifact createWindowsExeLauncher(
             .addJoinedValues(
                 "classpath",
                 ";",
-                Iterables.transform(classpath.toList(), Artifact.OUTPUT_DIR_RELATIVE_PATH_STRING))
+                Iterables.transform(classpath.toList(), Artifact.RUNFILES_PATH_STRING))
             // TODO(laszlocsomor): Change the Launcher to accept multiple jvm_flags entries. As of
             // 2019-02-13 the Launcher accepts just one jvm_flags entry, which contains all the
             // flags, joined by TAB characters. The Launcher splits up the string to get the

diff --git a/src/tools/launcher/launcher.cc b/src/tools/launcher/launcher.cc
@@ -151,10 +151,12 @@ wstring BinaryLauncherBase::Rlocation(wstring path,
     return path;
   }
 
-  if (path.find(L"external/") == 0) {
-    // Ignore 'has_workspace_name' when the path is under "external/". Such
-    // paths already have a workspace name in the next path component.
-    path = path.substr(9);
+  if (path.find(L"../") == 0) {
+    // Ignore 'has_workspace_name' when the runfile path is under "../". Such
+    // paths already have a workspace name in the next path component. We could
+    // append it to this->workspace_name and re-evaluate it, but this is
+    // simpler.
+    path = path.substr(3);
   } else if (!has_workspace_name) {
     path = this->workspace_name + L"/" + path;
   }