FIx build

bazelbuild · Sep 6, 2024 · a0d2f2d · a0d2f2d
1 parent a620c84
commit a0d2f2d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/repository/PatchUtil.java b/src/main/java/com/google/devtools/build/lib/bazel/repository/PatchUtil.java
@@ -412,6 +412,18 @@ private static void checkFilesStatusForPatching(
     }
   }
 
+  /**
+   * Apply a patch file under a directory
+   *
+   * @param patchFile the patch file to apply
+   * @param strip the number of leading components to strip from file path in the patch file
+   * @param outputDirectory the directory to apply the patch file to
+   */
+  public static void apply(Path patchFile, int strip, Path outputDirectory)
+      throws IOException, PatchFailedException {
+    apply(patchFile, strip, outputDirectory, /* singleFile= */ null);
+  }
+
   /**
    * Apply a patch file under a directory
    *

diff --git a/...va/com/google/devtools/build/lib/bazel/repository/starlark/StarlarkRepositoryContext.java b/...va/com/google/devtools/build/lib/bazel/repository/starlark/StarlarkRepositoryContext.java
@@ -455,7 +455,7 @@ public void patch(Object patchFile, StarlarkInt stripI, String watchPatch, Starl
     }
     maybeWatch(starlarkPath, ShouldWatch.fromString(watchPatch));
     try {
-      PatchUtil.apply(starlarkPath.getPath(), strip, workingDirectory, /* singleFile= */ null);
+      PatchUtil.apply(starlarkPath.getPath(), strip, workingDirectory);
     } catch (PatchFailedException e) {
       throw new RepositoryFunctionException(
           Starlark.errorf("Error applying patch %s: %s", starlarkPath, e.getMessage()),