From 48ace85e136d1b0ed6e0d40f793fb310e090390d Mon Sep 17 00:00:00 2001
From: Corentin Le Molgat <corentinl@google.com>
Date: Mon, 25 Mar 2024 11:22:45 +0100
Subject: [PATCH] base: backport from main

---
 ortools/base/BUILD.bazel   | 17 +++++------------
 ortools/base/filesystem.cc |  2 +-
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/ortools/base/BUILD.bazel b/ortools/base/BUILD.bazel
index 1a754e05f9..a5dbaa5e45 100644
--- a/ortools/base/BUILD.bazel
+++ b/ortools/base/BUILD.bazel
@@ -195,9 +195,13 @@ cc_library(
 
 cc_library(
     name = "file",
-    srcs = ["file.cc"],
+    srcs = [
+        "file.cc",
+        "filesystem.cc",
+    ],
     hdrs = [
         "file.h",
+        "filesystem.h",
         "helpers.h",
         "options.h",
     ],
@@ -211,17 +215,6 @@ cc_library(
     ],
 )
 
-cc_library(
-    name = "filesystem",
-    srcs = ["filesystem.cc"],
-    hdrs = ["filesystem.h"],
-    deps = [
-        ":file",
-        "@com_google_absl//absl/status",
-        "@com_google_absl//absl/strings",
-    ],
-)
-
 cc_library(
     name = "status_matchers",
     hdrs = ["status_matchers.h"],
diff --git a/ortools/base/filesystem.cc b/ortools/base/filesystem.cc
index 37d9c074e5..39e9cd5f5b 100644
--- a/ortools/base/filesystem.cc
+++ b/ortools/base/filesystem.cc
@@ -14,7 +14,7 @@
 #include "ortools/base/filesystem.h"
 
 #include <filesystem>  // NOLINT(build/c++17)
-#include <regex>  // NOLINT
+#include <regex>       // NOLINT
 
 #include "absl/status/status.h"
 #include "absl/strings/str_replace.h"