From 2fbb6bf77583458a73b3877215206cc7908f07e8 Mon Sep 17 00:00:00 2001
From: Mike Kruskal <mkruskal@google.com>
Date: Wed, 25 Jan 2023 12:03:30 -0800
Subject: [PATCH] Remove Abseil patch in tests and bump our Bazel version to
 20230125.rc3

PiperOrigin-RevId: 504625323
---
 kokoro/common/setup_kokoro_environment.sh | 5 -----
 kokoro/macos-next/cpp/build.sh            | 4 ----
 kokoro/windows/prepare_build_win64.bat    | 4 ----
 protobuf_deps.bzl                         | 6 +++---
 4 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/kokoro/common/setup_kokoro_environment.sh b/kokoro/common/setup_kokoro_environment.sh
index 2696e7062b..65c10b66e5 100755
--- a/kokoro/common/setup_kokoro_environment.sh
+++ b/kokoro/common/setup_kokoro_environment.sh
@@ -9,8 +9,3 @@ sudo apt-get -y update && \
     gcc-7 g++-7
 sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-7 100 --slave /usr/bin/g++ g++ /usr/bin/g++-7
 sudo update-alternatives --set gcc /usr/bin/gcc-7
-
-# TODO(b/265232445) Remove this once the patch is upstreamed
-git submodule update --init --recursive
-sed -i 's:random/mock_helpers.h:random/internal/mock_helpers.h:' third_party/abseil-cpp/CMake/AbseilDll.cmake
-sed -i 's:ABSL_INTERNA_TEST_DLL_TARGETS:ABSL_INTERNAL_TEST_DLL_TARGETS:' third_party/abseil-cpp/CMake/AbseilDll.cmake
diff --git a/kokoro/macos-next/cpp/build.sh b/kokoro/macos-next/cpp/build.sh
index cb4dbc300a..1e2ae40d0d 100755
--- a/kokoro/macos-next/cpp/build.sh
+++ b/kokoro/macos-next/cpp/build.sh
@@ -24,10 +24,6 @@ cd $(dirname $0)/../../..
 git submodule update --init --recursive
 ./regenerate_stale_files.sh
 
-# TODO(b/265232445) Remove this once the patch is upstreamed
-sed -i '' 's:random/mock_helpers.h:random/internal/mock_helpers.h:' third_party/abseil-cpp/CMake/AbseilDll.cmake
-sed -i '' 's:ABSL_INTERNA_TEST_DLL_TARGETS:ABSL_INTERNAL_TEST_DLL_TARGETS:' third_party/abseil-cpp/CMake/AbseilDll.cmake
-
 #
 # Run build
 #
diff --git a/kokoro/windows/prepare_build_win64.bat b/kokoro/windows/prepare_build_win64.bat
index 24b5869f09..b57d0bf75a 100644
--- a/kokoro/windows/prepare_build_win64.bat
+++ b/kokoro/windows/prepare_build_win64.bat
@@ -9,10 +9,6 @@ Powershell.exe -Command "New-ItemProperty -Path HKLM:\SYSTEM\CurrentControlSet\C
 @rem Update git submodules.
 git submodule update --init --recursive
 
-@rem TODO(b/265232445) Remove this once the patch is upstreamed
-sed -i 's:random/mock_helpers.h:random/internal/mock_helpers.h:' third_party\abseil-cpp\CMake\AbseilDll.cmake
-sed -i 's:ABSL_INTERNA_TEST_DLL_TARGETS:ABSL_INTERNAL_TEST_DLL_TARGETS:' third_party\abseil-cpp\CMake\AbseilDll.cmake
-
 @rem Select Visual Studio 2017.
 call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" x64
 
diff --git a/protobuf_deps.bzl b/protobuf_deps.bzl
index 63ddc1b900..7cc5c88653 100644
--- a/protobuf_deps.bzl
+++ b/protobuf_deps.bzl
@@ -37,12 +37,12 @@ def protobuf_deps():
         )
 
     if not native.existing_rule("com_google_absl"):
-        # Abseil LTS from November 2021
+        # Abseil LTS RC3 from January 2023
         _github_archive(
             name = "com_google_absl",
             repo = "https://github.com/abseil/abseil-cpp",
-            commit = "f016820c2496845293659e181643aa1509487e03",
-            sha256 = "f4ad187e815deb34f70218173799659867087fa8925b9741934c0462b88d2f93",
+            commit = "78be63686ba732b25052be15f8d6dee891c05749",
+            sha256 = "4f356a07b9ec06ef51f943928508566e992f621ed5fa4dd588865d7bed1284cd",
         )
 
     if not native.existing_rule("zlib"):