Clarify the purpose of the boolean argument to createRunfiles.

PiperOrigin-RevId: 547476948 Change-Id: Ia0f68c3b367b1fa33094a5b58b42210d06190b65
bazelbuild · Jul 12, 2023 · 1ef4aac · 1ef4aac
1 parent 65c16a9
commit 1ef4aac
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/src/main/java/com/google/devtools/build/lib/exec/RunfilesTreeUpdater.java b/src/main/java/com/google/devtools/build/lib/exec/RunfilesTreeUpdater.java
@@ -83,7 +83,7 @@ public void updateRunfiles(
         // We are the first attempt; update the runfiles tree and mark the future complete.
         try {
           updateRunfilesTree(
-              runfilesDir, env, outErr, runfilesSupplier.isRunfileLinksEnabled(runfilesDir));
+              runfilesDir, env, outErr, !runfilesSupplier.isRunfileLinksEnabled(runfilesDir));
           freshFuture.complete(null);
         } catch (Exception e) {
           freshFuture.completeExceptionally(e);
@@ -100,7 +100,7 @@ private void updateRunfilesTree(
       PathFragment runfilesDir,
       ImmutableMap<String, String> env,
       OutErr outErr,
-      boolean enableRunfiles)
+      boolean manifestOnly)
       throws IOException, ExecException, InterruptedException {
     Path runfilesDirPath = execRoot.getRelative(runfilesDir);
     Path inputManifest = RunfilesSupport.inputManifestPath(runfilesDirPath);
@@ -131,6 +131,6 @@ private void updateRunfilesTree(
 
     SymlinkTreeHelper helper =
         new SymlinkTreeHelper(inputManifest, runfilesDirPath, /* filesetTree= */ false);
-    helper.createSymlinks(execRoot, outErr, binTools, env, enableRunfiles);
+    helper.createSymlinks(execRoot, outErr, binTools, env, manifestOnly);
   }
 }
diff --git a/src/main/java/com/google/devtools/build/lib/exec/SymlinkTreeHelper.java b/src/main/java/com/google/devtools/build/lib/exec/SymlinkTreeHelper.java
@@ -120,19 +120,19 @@ public void createSymlinksDirectly(Path symlinkTreeRoot, Map<PathFragment, Artif
   /**
    * Creates symlink tree and output manifest using the {@code build-runfiles.cc} tool.
    *
-   * @param enableRunfiles If {@code false} only the output manifest is created.
+   * @param manifestOnly If {@code true}, only the output manifest is created.
    */
   public void createSymlinks(
       Path execRoot,
       OutErr outErr,
       BinTools binTools,
       Map<String, String> shellEnvironment,
-      boolean enableRunfiles)
+      boolean manifestOnly)
       throws ExecException, InterruptedException {
-    if (enableRunfiles) {
-      createSymlinksUsingCommand(execRoot, binTools, shellEnvironment, outErr);
-    } else {
+    if (manifestOnly) {
       copyManifest();
+    } else {
+      createSymlinksUsingCommand(execRoot, binTools, shellEnvironment, outErr);
     }
   }