From ea2f20498e2853a58875f247b06edcb567ccd86b Mon Sep 17 00:00:00 2001
From: Mike Kruskal <62662355+mkruskal-google@users.noreply.github.com>
Date: Thu, 8 Sep 2022 10:57:01 -0700
Subject: [PATCH] Uninstall system protobuf to prevent version conflicts
 (#10522)

---
 kokoro/macos/prepare_build_macos_rc            | 4 ++++
 kokoro/release/python/macos/build_artifacts.sh | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/kokoro/macos/prepare_build_macos_rc b/kokoro/macos/prepare_build_macos_rc
index 75b50c09f93c3..8f99f105face3 100755
--- a/kokoro/macos/prepare_build_macos_rc
+++ b/kokoro/macos/prepare_build_macos_rc
@@ -6,6 +6,10 @@ set -eux
 
 export HOMEBREW_PREFIX=$(brew --prefix)
 
+##
+# Remove any pre-existing protobuf installation.
+brew uninstall protobuf
+
 ##
 # Select Xcode version
 
diff --git a/kokoro/release/python/macos/build_artifacts.sh b/kokoro/release/python/macos/build_artifacts.sh
index a72ee6733f1c9..296bd9aef399f 100755
--- a/kokoro/release/python/macos/build_artifacts.sh
+++ b/kokoro/release/python/macos/build_artifacts.sh
@@ -2,6 +2,9 @@
 
 set -ex
 
+# Remove any pre-existing protobuf installation.
+brew uninstall protobuf
+
 # change to repo root
 pushd $(dirname $0)/../../../..