base: backport from main

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"],

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"