diff --git a/.bazelrc b/.bazelrc
index e781c14cea..3fc9b4f3d2 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -2,6 +2,7 @@
 build --flag_alias=with_bop=//ortools/linear_solver:with_bop
 build --flag_alias=with_cbc=//ortools/linear_solver:with_cbc
 build --flag_alias=with_clp=//ortools/linear_solver:with_clp
+build --flag_alias=with_cp_sat=//ortools/linear_solver:with_cp_sat
 build --flag_alias=with_glop=//ortools/linear_solver:with_glop
 build --flag_alias=with_glpk=//ortools/linear_solver:with_glpk
 build --flag_alias=with_highs=//ortools/linear_solver:with_highs
diff --git a/ortools/linear_solver/BUILD.bazel b/ortools/linear_solver/BUILD.bazel
index 7e34d96197..ae21b4f2e8 100644
--- a/ortools/linear_solver/BUILD.bazel
+++ b/ortools/linear_solver/BUILD.bazel
@@ -58,6 +58,18 @@ config_setting(
     },
 )
 
+bool_flag(
+    name = "with_cp_sat",
+    build_setting_default = True,
+)
+
+config_setting(
+    name = "use_cp_sat",
+    flag_values = {
+        ":with_cp_sat": "true",
+    },
+)
+
 bool_flag(
     name = "with_glop",
     build_setting_default = True,
diff --git a/ortools/linear_solver/python/py.typed b/ortools/linear_solver/python/py.typed
deleted file mode 100644
index e69de29bb2..0000000000