Update Protobuf to 28.2

Bug: b/372258572 Test: N/A Change-Id: I08ddb7c0aeff28a64d9c8ade751987436c125bc7 GitOrigin-RevId: ee4305bad48ac5f2d6042c6b642f7d59888ddf40
bazelbuild · Oct 21, 2024 · 7d5ab5b · 7d5ab5b
1 parent 33f67a6
commit 7d5ab5b
Show file tree

Hide file tree

Showing 13 changed files with 13 additions and 47 deletions.
diff --git a/MODULE.bazel b/MODULE.bazel
@@ -49,19 +49,13 @@ use_repo(node, "nodejs", "nodejs_toolchains")
 # Protobuf and abseil are linked against by goma's input processor so we must keep the source versions in sync
 bazel_dep(
     name = "protobuf",
-    version = "26.0.bcr.1",  # Same version as used in goma patch
+    version = "28.2",  # Same version as used in goma fork
     repo_name = "com_google_protobuf",
 )
-single_version_override(
-    module_name = "protobuf",
-    patch_strip = 0,
-    patches = ["//third_party/patches/protobuf:clang-cl-link-opts.patch"],
-)
-
 bazel_dep(name = "abseil-cpp", repo_name = "com_google_absl")
 git_override(
     module_name = "abseil-cpp",
-    commit = "4a2c63365eff8823a5221db86ef490e828306f9d",  # Same commit as in goma patch
+    commit = "4a2c63365eff8823a5221db86ef490e828306f9d",  # Same commit as in goma fork
     remote = "https://github.com/abseil/abseil-cpp.git",
 )
 
@@ -72,7 +66,7 @@ bazel_dep(name = "googletest", version = "1.14.0.bcr.1", repo_name = "com_google
 
 gclient_repository = use_repo_rule("//:gclient.bzl", "gclient_repository")
 
-GOMA_REV = "7ab631ba788178c65281ef46b3edce251c595f23"
+GOMA_REV = "b2f15f7360d58a9fb881586fff3645ce154eb70b"
 
 gclient_repository(
     name = "goma",

diff --git a/api/auth/auth.pb.go b/api/auth/auth.pb.go
diff --git a/api/credshelper/credshelper.pb.go b/api/credshelper/credshelper.pb.go
diff --git a/api/log/log.pb.go b/api/log/log.pb.go
diff --git a/api/proxy/depscache.pb.go b/api/proxy/depscache.pb.go
diff --git a/api/proxy/mismatch_ignore_rule.pb.go b/api/proxy/mismatch_ignore_rule.pb.go
diff --git a/api/proxy/proxy.pb.go b/api/proxy/proxy.pb.go
diff --git a/api/scandeps/cppscandeps.pb.go b/api/scandeps/cppscandeps.pb.go
diff --git a/api/stat/stat.pb.go b/api/stat/stat.pb.go
diff --git a/api/stats/stats.pb.go b/api/stats/stats.pb.go
diff --git a/experiments/api/experiment/experiment.pb.go b/experiments/api/experiment/experiment.pb.go
diff --git a/third_party/patches/protobuf/BUILD.bazel b/third_party/patches/protobuf/BUILD.bazel
diff --git a/third_party/patches/protobuf/clang-cl-link-opts.patch b/third_party/patches/protobuf/clang-cl-link-opts.patch