From ee57fd9e0e310a46c67c4e45c4e953a494cec50f Mon Sep 17 00:00:00 2001
From: Richard Belleville <rbellevi@google.com>
Date: Tue, 2 Jan 2024 16:36:01 -0800
Subject: [PATCH] Ensure utf8 implementations are included in build

---
 tools/distrib/python/grpcio_tools/protoc_lib_deps.py | 3 ++-
 tools/distrib/python/make_grpcio_tools.py            | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/tools/distrib/python/grpcio_tools/protoc_lib_deps.py b/tools/distrib/python/grpcio_tools/protoc_lib_deps.py
index 47fe9ed6fff..a98ce9437d9 100644
--- a/tools/distrib/python/grpcio_tools/protoc_lib_deps.py
+++ b/tools/distrib/python/grpcio_tools/protoc_lib_deps.py
@@ -296,7 +296,8 @@ CC_FILES=[
     'third_party/protobuf/src/google/protobuf/text_format.cc',
     'third_party/protobuf/src/google/protobuf/unknown_field_set.cc',
     'third_party/protobuf/src/google/protobuf/wire_format.cc',
-    'third_party/protobuf/src/google/protobuf/wire_format_lite.cc'
+    'third_party/protobuf/src/google/protobuf/wire_format_lite.cc',
+    'third_party/protobuf/third_party/utf8_range/utf8_validity.cc'
 ]
 
 PROTO_FILES=[
diff --git a/tools/distrib/python/make_grpcio_tools.py b/tools/distrib/python/make_grpcio_tools.py
index b791b6edb4a..85378c1a250 100755
--- a/tools/distrib/python/make_grpcio_tools.py
+++ b/tools/distrib/python/make_grpcio_tools.py
@@ -63,6 +63,7 @@ COMMIT_HASH_SUFFIX = '"'
 EXTERNAL_LINKS = [
     ("@com_google_absl//", "third_party/abseil-cpp/"),
     ("@com_google_protobuf//", "third_party/protobuf/"),
+    ("@utf8_range//", "third_party/protobuf/third_party/utf8_range"),
 ]
 
 PROTOBUF_PROTO_PREFIX = "@com_google_protobuf//src/"