From a839fbd1d6011f3b204dc6ea7bf536a0ed2808b5 Mon Sep 17 00:00:00 2001
From: Jeremy Volkman <jeremy@jvolkman.com>
Date: Thu, 26 May 2022 16:14:34 -0700
Subject: [PATCH 1/3] java_names.h -> names.h

---
 compiler/src/java_plugin/cpp/java_generator.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compiler/src/java_plugin/cpp/java_generator.cpp b/compiler/src/java_plugin/cpp/java_generator.cpp
index 6882940378f..5f23e2583b2 100644
--- a/compiler/src/java_plugin/cpp/java_generator.cpp
+++ b/compiler/src/java_plugin/cpp/java_generator.cpp
@@ -22,7 +22,7 @@
 #include <map>
 #include <set>
 #include <vector>
-#include <google/protobuf/compiler/java/java_names.h>
+#include <google/protobuf/compiler/java/names.h>
 #include <google/protobuf/descriptor.h>
 #include <google/protobuf/descriptor.pb.h>
 #include <google/protobuf/io/printer.h>

From bc05c9a0562e8341b37f307d7429f94ec840ab67 Mon Sep 17 00:00:00 2001
From: Jeremy Volkman <jeremy@jvolkman.com>
Date: Fri, 27 May 2022 09:59:26 -0700
Subject: [PATCH 2/3] Update build.gradle

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index af3fccb35e3..7ee3b38895a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -58,7 +58,7 @@ subprojects {
         nettyVersion = '4.1.72.Final'
         guavaVersion = '31.0.1-android'
         googleauthVersion = '1.4.0'
-        protobufVersion = '3.19.2'
+        protobufVersion = '3.21.0'
         protocVersion = protobufVersion
         opencensusVersion = '0.31.0'
         autovalueVersion = '1.9'

From 77e663e1c314d6608dfdc0dfcd55937024c5072b Mon Sep 17 00:00:00 2001
From: Jeremy Volkman <jeremy@jvolkman.com>
Date: Fri, 27 May 2022 10:59:51 -0700
Subject: [PATCH 3/3] Switch java_names.h/names.h based on
 GOOGLE_PROTOBUF_VERSION

---
 build.gradle                                    | 2 +-
 compiler/src/java_plugin/cpp/java_generator.cpp | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index 7ee3b38895a..af3fccb35e3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -58,7 +58,7 @@ subprojects {
         nettyVersion = '4.1.72.Final'
         guavaVersion = '31.0.1-android'
         googleauthVersion = '1.4.0'
-        protobufVersion = '3.21.0'
+        protobufVersion = '3.19.2'
         protocVersion = protobufVersion
         opencensusVersion = '0.31.0'
         autovalueVersion = '1.9'
diff --git a/compiler/src/java_plugin/cpp/java_generator.cpp b/compiler/src/java_plugin/cpp/java_generator.cpp
index 5f23e2583b2..3bb56ae12ee 100644
--- a/compiler/src/java_plugin/cpp/java_generator.cpp
+++ b/compiler/src/java_plugin/cpp/java_generator.cpp
@@ -22,11 +22,18 @@
 #include <map>
 #include <set>
 #include <vector>
-#include <google/protobuf/compiler/java/names.h>
 #include <google/protobuf/descriptor.h>
 #include <google/protobuf/descriptor.pb.h>
 #include <google/protobuf/io/printer.h>
 #include <google/protobuf/io/zero_copy_stream.h>
+#include <google/protobuf/stubs/common.h>
+
+// Protobuf 3.21 changed the name of this file.
+#if GOOGLE_PROTOBUF_VERSION >= 3021000
+  #include <google/protobuf/compiler/java/names.h>
+#else
+  #include <google/protobuf/compiler/java/java_names.h>
+#endif
 
 // Stringify helpers used solely to cast GRPC_VERSION
 #ifndef STR