From 5a5538c1f6de819764f1dc241a39a8dae830776b Mon Sep 17 00:00:00 2001
From: Dmitri Plotnikov <dplotnikov@google.com>
Date: Wed, 17 Jun 2026 14:12:14 -0700
Subject: [PATCH] Update cel-cpp git override commit and remote in MODULE.bazel

PiperOrigin-RevId: 933916502
---
 MODULE.bazel                             | 11 ++-------
 bazel/BUILD                              | 10 --------
 bazel/antlr.patch                        | 30 ------------------------
 cel_expr_python/py_descriptor_database.h |  4 +++-
 4 files changed, 5 insertions(+), 50 deletions(-)
 delete mode 100644 bazel/BUILD
 delete mode 100644 bazel/antlr.patch

diff --git a/MODULE.bazel b/MODULE.bazel
index 1ed9a28..7404b9f 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -15,8 +15,8 @@ bazel_dep(name = "bazel_skylib", version = "1.9.0")
 bazel_dep(name = "cel-cpp", version = "0.15.0", repo_name = "com_google_cel_cpp")
 git_override(
     module_name = "cel-cpp",
-    commit = "2e6e9ff4493bfbe0baf883107f3fb7ce6f675d88",
-    remote = "https://github.com/google/cel-cpp",
+    commit = "8b7068abb4062074a135491ad8357139287084f9",
+    remote = "https://github.com/cel-expr/cel-cpp",
 )
 
 # https://registry.bazel.build/modules/cel-spec
@@ -46,13 +46,6 @@ bazel_dep(name = "rules_proto", version = "7.1.0")
 # https://registry.bazel.build/modules/rules_python
 bazel_dep(name = "rules_python", version = "1.9.0")
 
-# On Windows the file system is case-insensitive, which creates a collision between
-# antlr4-cpp-runtime/VERSION and the system `#include <version>`
-single_version_override(
-    module_name = "antlr4-cpp-runtime",
-    patches = ["//bazel:antlr.patch"],
-)
-
 # Configure rules_python's hermetic toolchains to resolve external
 # dependencies natively. Under Windows, compiling pybind C++ extensions
 # against Python 3.11 headers requires that the execution environment
diff --git a/bazel/BUILD b/bazel/BUILD
deleted file mode 100644
index 18c905f..0000000
--- a/bazel/BUILD
+++ /dev/null
@@ -1,10 +0,0 @@
-load("@pybind11_bazel//:build_defs.bzl", "pybind_extension")
-load("@rules_python//python:py_library.bzl", "py_library")
-load("@rules_python//python:py_test.bzl", "py_test")
-
-exports_files(
-    srcs = [
-        "antlr.patch",
-    ],
-    visibility = ["//visibility:public"],
-)
diff --git a/bazel/antlr.patch b/bazel/antlr.patch
deleted file mode 100644
index afe9cb4..0000000
--- a/bazel/antlr.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- BUILD.bazel
-+++ BUILD.bazel
-@@ -17,21 +17,21 @@
- cc_library(
-     name = "antlr4-cpp-runtime",
-     srcs = glob(["runtime/src/**/*.cpp"]),
-     hdrs = ["runtime/src/antlr4-runtime.h"],
-     copts = ["-fexceptions"],
--    defines = ["ANTLR4CPP_USING_ABSEIL"],
-+    defines = ["ANTLR4CPP_USING_ABSEIL", "ANTLR4CPP_STATIC"],
-     features = ["-use_header_modules"],
-     includes = ["runtime/src"],
-     textual_hdrs = glob(
-         ["runtime/src/**/*.h"],
-         exclude = ["runtime/src/antlr4-runtime.h"],
-     ),
-     visibility = ["//visibility:public"],
-     deps = [
-         "@com_google_absl//absl/base",
-         "@com_google_absl//absl/base:core_headers",
-         "@com_google_absl//absl/container:flat_hash_map",
-         "@com_google_absl//absl/container:flat_hash_set",
-         "@com_google_absl//absl/synchronization",
-     ],
- )
-
---- VERSION
-+++ /dev/null
-@@ -1,1 +1,0 @@
--4.13.2
diff --git a/cel_expr_python/py_descriptor_database.h b/cel_expr_python/py_descriptor_database.h
index 610f8b2..5f621f4 100644
--- a/cel_expr_python/py_descriptor_database.h
+++ b/cel_expr_python/py_descriptor_database.h
@@ -19,6 +19,8 @@
 
 #include <Python.h>  // IWYU pragma: keep - Needed for PyObject
 
+#include <string_view>  // IWYU pragma: keep - Needed for string_view in OSS
+
 #include "google/protobuf/descriptor.pb.h"
 #include "google/protobuf/descriptor_database.h"
 
@@ -27,7 +29,7 @@ namespace cel_python {
 // A DescriptorDatabase that uses a Python DescriptorPool to find descriptors.
 class PyDescriptorDatabase : public google::protobuf::DescriptorDatabase {
  private:
-  using StringViewArg = const std::string&;
+  using StringViewArg = std::string_view;
  public:
   explicit PyDescriptorDatabase(PyObject* py_descriptor_pool);
   ~PyDescriptorDatabase() override;