CMake: Upgrade nanopb to 0.3.9.2 (#2985)

wilhuff · web-flow · commit 53d3ca199a3a · 2019-05-13T08:24:54.000-07:00
* Update nanopb to 0.3.9.2

This matches google3, even though 0.3.9.3 is out

* Regenerate protos with nanopb 0.3.9.2
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -202,12 +202,12 @@ set(nanopb_MSVC_STATIC_RUNTIME OFF CACHE BOOL "Link static runtime libraries")
 add_external_subdirectory(nanopb)
 
 target_compile_definitions(
-  protobuf-nanopb
+  protobuf-nanopb-static
   PUBLIC -DPB_FIELD_32BIT -DPB_ENABLE_MALLOC
 )
 
 target_include_directories(
-  protobuf-nanopb
+  protobuf-nanopb-static
   INTERFACE $<BUILD_INTERFACE:${FIREBASE_EXTERNAL_SOURCE_DIR}/nanopb>
 )
 
diff --git a/Firestore/Protos/CMakeLists.txt b/Firestore/Protos/CMakeLists.txt
@@ -144,7 +144,7 @@ cc_library(
   SOURCES
     ${NANOPB_GENERATED_SOURCES}
   DEPENDS
-    protobuf-nanopb
+    protobuf-nanopb-static
 )
 
 target_include_directories(
diff --git a/Firestore/Protos/nanopb/firestore/local/maybe_document.nanopb.cc b/Firestore/Protos/nanopb/firestore/local/maybe_document.nanopb.cc
@@ -15,7 +15,7 @@
  */
 
 /* Automatically generated nanopb constant definitions */
-/* Generated by nanopb-0.3.9.1 */
+/* Generated by nanopb-0.3.9.2 */
 
 #include "maybe_document.nanopb.h"
 
diff --git a/Firestore/Protos/nanopb/firestore/local/maybe_document.nanopb.h b/Firestore/Protos/nanopb/firestore/local/maybe_document.nanopb.h
@@ -15,7 +15,7 @@
  */
 
 /* Automatically generated nanopb header */
-/* Generated by nanopb-0.3.9.1 */
+/* Generated by nanopb-0.3.9.2 */
 
 #ifndef PB_FIRESTORE_CLIENT_MAYBE_DOCUMENT_NANOPB_H_INCLUDED
 #define PB_FIRESTORE_CLIENT_MAYBE_DOCUMENT_NANOPB_H_INCLUDED
@@ -86,7 +86,7 @@ extern const pb_field_t firestore_client_MaybeDocument_fields[5];
 /* Maximum encoded size of messages (where known) */
 /* firestore_client_NoDocument_size depends on runtime parameters */
 /* firestore_client_UnknownDocument_size depends on runtime parameters */
-#define firestore_client_MaybeDocument_size      (2 + (((firestore_client_NoDocument_size > firestore_client_UnknownDocument_size ? firestore_client_NoDocument_size : firestore_client_UnknownDocument_size) > google_firestore_v1_Document_size ? (firestore_client_NoDocument_size > firestore_client_UnknownDocument_size ? firestore_client_NoDocument_size : firestore_client_UnknownDocument_size) : google_firestore_v1_Document_size) > 0 ? ((firestore_client_NoDocument_size > firestore_client_UnknownDocument_size ? firestore_client_NoDocument_size : firestore_client_UnknownDocument_size) > google_firestore_v1_Document_size ? (firestore_client_NoDocument_size > firestore_client_UnknownDocument_size ? firestore_client_NoDocument_size : firestore_client_UnknownDocument_size) : google_firestore_v1_Document_size) : 0))
+/* firestore_client_MaybeDocument_size depends on runtime parameters */
 
 /* Message IDs (where set with "msgid" option) */
 #ifdef PB_MSGID
diff --git a/Firestore/Protos/nanopb/firestore/local/mutation.nanopb.cc b/Firestore/Protos/nanopb/firestore/local/mutation.nanopb.cc
@@ -15,7 +15,7 @@
  */
 
 /* Automatically generated nanopb constant definitions */
-/* Generated by nanopb-0.3.9.1 */
+/* Generated by nanopb-0.3.9.2 */
 
 #include "mutation.nanopb.h"
 
diff --git a/Firestore/Protos/nanopb/firestore/local/mutation.nanopb.h b/Firestore/Protos/nanopb/firestore/local/mutation.nanopb.h
@@ -15,7 +15,7 @@
  */
 
 /* Automatically generated nanopb header */
-/* Generated by nanopb-0.3.9.1 */
+/* Generated by nanopb-0.3.9.2 */
 
 #ifndef PB_FIRESTORE_CLIENT_MUTATION_NANOPB_H_INCLUDED
 #define PB_FIRESTORE_CLIENT_MUTATION_NANOPB_H_INCLUDED
diff --git a/Firestore/Protos/nanopb/firestore/local/target.nanopb.cc b/Firestore/Protos/nanopb/firestore/local/target.nanopb.cc
@@ -15,7 +15,7 @@
  */
 
 /* Automatically generated nanopb constant definitions */
-/* Generated by nanopb-0.3.9.1 */
+/* Generated by nanopb-0.3.9.2 */
 
 #include "target.nanopb.h"
 
diff --git a/Firestore/Protos/nanopb/firestore/local/target.nanopb.h b/Firestore/Protos/nanopb/firestore/local/target.nanopb.h
@@ -15,7 +15,7 @@
  */
 
 /* Automatically generated nanopb header */
-/* Generated by nanopb-0.3.9.1 */
+/* Generated by nanopb-0.3.9.2 */
 
 #ifndef PB_FIRESTORE_CLIENT_TARGET_NANOPB_H_INCLUDED
 #define PB_FIRESTORE_CLIENT_TARGET_NANOPB_H_INCLUDED
diff --git a/Firestore/Protos/nanopb/google/api/annotations.nanopb.cc b/Firestore/Protos/nanopb/google/api/annotations.nanopb.cc
@@ -15,7 +15,7 @@
  */
 
 /* Automatically generated nanopb constant definitions */
-/* Generated by nanopb-0.3.9.1 */
+/* Generated by nanopb-0.3.9.2 */
 
 #include "annotations.nanopb.h"
 
diff --git a/Firestore/Protos/nanopb/google/api/annotations.nanopb.h b/Firestore/Protos/nanopb/google/api/annotations.nanopb.h
@@ -15,7 +15,7 @@
  */
 
 /* Automatically generated nanopb header */
-/* Generated by nanopb-0.3.9.1 */
+/* Generated by nanopb-0.3.9.2 */
 
 #ifndef PB_GOOGLE_API_ANNOTATIONS_NANOPB_H_INCLUDED
 #define PB_GOOGLE_API_ANNOTATIONS_NANOPB_H_INCLUDED
diff --git a/Firestore/Protos/nanopb/google/api/http.nanopb.cc b/Firestore/Protos/nanopb/google/api/http.nanopb.cc
@@ -15,7 +15,7 @@
  */
 
 /* Automatically generated nanopb constant definitions */
-/* Generated by nanopb-0.3.9.1 */
+/* Generated by nanopb-0.3.9.2 */
 
 #include "http.nanopb.h"
 
diff --git a/Firestore/Protos/nanopb/google/api/http.nanopb.h b/Firestore/Protos/nanopb/google/api/http.nanopb.h
@@ -15,7 +15,7 @@
  */
 
 /* Automatically generated nanopb header */
-/* Generated by nanopb-0.3.9.1 */
+/* Generated by nanopb-0.3.9.2 */
 
 #ifndef PB_GOOGLE_API_HTTP_NANOPB_H_INCLUDED
 #define PB_GOOGLE_API_HTTP_NANOPB_H_INCLUDED
diff --git a/Firestore/Protos/nanopb/google/firestore/v1/common.nanopb.cc b/Firestore/Protos/nanopb/google/firestore/v1/common.nanopb.cc
@@ -15,7 +15,7 @@
  */
 
 /* Automatically generated nanopb constant definitions */
-/* Generated by nanopb-0.3.9.1 */
+/* Generated by nanopb-0.3.9.2 */
 
 #include "common.nanopb.h"
 
diff --git a/Firestore/Protos/nanopb/google/firestore/v1/common.nanopb.h b/Firestore/Protos/nanopb/google/firestore/v1/common.nanopb.h
@@ -15,7 +15,7 @@
  */
 
 /* Automatically generated nanopb header */
-/* Generated by nanopb-0.3.9.1 */
+/* Generated by nanopb-0.3.9.2 */
 
 #ifndef PB_GOOGLE_FIRESTORE_V1_COMMON_NANOPB_H_INCLUDED
 #define PB_GOOGLE_FIRESTORE_V1_COMMON_NANOPB_H_INCLUDED
@@ -105,7 +105,7 @@ extern const pb_field_t google_firestore_v1_TransactionOptions_ReadOnly_fields[2
 /* Maximum encoded size of messages (where known) */
 /* google_firestore_v1_DocumentMask_size depends on runtime parameters */
 #define google_firestore_v1_Precondition_size    24
-#define google_firestore_v1_TransactionOptions_size (0 + (google_firestore_v1_TransactionOptions_ReadWrite_size > 26 ? google_firestore_v1_TransactionOptions_ReadWrite_size : 26))
+/* google_firestore_v1_TransactionOptions_size depends on runtime parameters */
 /* google_firestore_v1_TransactionOptions_ReadWrite_size depends on runtime parameters */
 #define google_firestore_v1_TransactionOptions_ReadOnly_size 24
 
diff --git a/Firestore/Protos/nanopb/google/firestore/v1/document.nanopb.cc b/Firestore/Protos/nanopb/google/firestore/v1/document.nanopb.cc
@@ -15,7 +15,7 @@
  */
 
 /* Automatically generated nanopb constant definitions */
-/* Generated by nanopb-0.3.9.1 */
+/* Generated by nanopb-0.3.9.2 */
 
 #include "document.nanopb.h"
 
diff --git a/Firestore/Protos/nanopb/google/firestore/v1/document.nanopb.h b/Firestore/Protos/nanopb/google/firestore/v1/document.nanopb.h
@@ -15,7 +15,7 @@
  */
 
 /* Automatically generated nanopb header */
-/* Generated by nanopb-0.3.9.1 */
+/* Generated by nanopb-0.3.9.2 */
 
 #ifndef PB_GOOGLE_FIRESTORE_V1_DOCUMENT_NANOPB_H_INCLUDED
 #define PB_GOOGLE_FIRESTORE_V1_DOCUMENT_NANOPB_H_INCLUDED
diff --git a/Firestore/Protos/nanopb/google/firestore/v1/firestore.nanopb.cc b/Firestore/Protos/nanopb/google/firestore/v1/firestore.nanopb.cc
@@ -15,7 +15,7 @@
  */
 
 /* Automatically generated nanopb constant definitions */
-/* Generated by nanopb-0.3.9.1 */
+/* Generated by nanopb-0.3.9.2 */
 
 #include "firestore.nanopb.h"
 
diff --git a/Firestore/Protos/nanopb/google/firestore/v1/firestore.nanopb.h b/Firestore/Protos/nanopb/google/firestore/v1/firestore.nanopb.h
@@ -15,7 +15,7 @@
  */
 
 /* Automatically generated nanopb header */
-/* Generated by nanopb-0.3.9.1 */
+/* Generated by nanopb-0.3.9.2 */
 
 #ifndef PB_GOOGLE_FIRESTORE_V1_FIRESTORE_NANOPB_H_INCLUDED
 #define PB_GOOGLE_FIRESTORE_V1_FIRESTORE_NANOPB_H_INCLUDED
@@ -513,7 +513,7 @@ extern const pb_field_t google_firestore_v1_ListCollectionIdsResponse_fields[3];
 /* google_firestore_v1_WriteResponse_size depends on runtime parameters */
 /* google_firestore_v1_ListenRequest_size depends on runtime parameters */
 /* google_firestore_v1_ListenRequest_LabelsEntry_size depends on runtime parameters */
-#define google_firestore_v1_ListenResponse_size  (0 + ((((google_firestore_v1_TargetChange_size > google_firestore_v1_DocumentChange_size ? google_firestore_v1_TargetChange_size : google_firestore_v1_DocumentChange_size) > google_firestore_v1_DocumentRemove_size ? (google_firestore_v1_TargetChange_size > google_firestore_v1_DocumentChange_size ? google_firestore_v1_TargetChange_size : google_firestore_v1_DocumentChange_size) : google_firestore_v1_DocumentRemove_size) > google_firestore_v1_DocumentDelete_size ? ((google_firestore_v1_TargetChange_size > google_firestore_v1_DocumentChange_size ? google_firestore_v1_TargetChange_size : google_firestore_v1_DocumentChange_size) > google_firestore_v1_DocumentRemove_size ? (google_firestore_v1_TargetChange_size > google_firestore_v1_DocumentChange_size ? google_firestore_v1_TargetChange_size : google_firestore_v1_DocumentChange_size) : google_firestore_v1_DocumentRemove_size) : google_firestore_v1_DocumentDelete_size) > 24 ? (((google_firestore_v1_TargetChange_size > google_firestore_v1_DocumentChange_size ? google_firestore_v1_TargetChange_size : google_firestore_v1_DocumentChange_size) > google_firestore_v1_DocumentRemove_size ? (google_firestore_v1_TargetChange_size > google_firestore_v1_DocumentChange_size ? google_firestore_v1_TargetChange_size : google_firestore_v1_DocumentChange_size) : google_firestore_v1_DocumentRemove_size) > google_firestore_v1_DocumentDelete_size ? ((google_firestore_v1_TargetChange_size > google_firestore_v1_DocumentChange_size ? google_firestore_v1_TargetChange_size : google_firestore_v1_DocumentChange_size) > google_firestore_v1_DocumentRemove_size ? (google_firestore_v1_TargetChange_size > google_firestore_v1_DocumentChange_size ? google_firestore_v1_TargetChange_size : google_firestore_v1_DocumentChange_size) : google_firestore_v1_DocumentRemove_size) : google_firestore_v1_DocumentDelete_size) : 24))
+/* google_firestore_v1_ListenResponse_size depends on runtime parameters */
 /* google_firestore_v1_Target_size depends on runtime parameters */
 /* google_firestore_v1_Target_DocumentsTarget_size depends on runtime parameters */
 /* google_firestore_v1_Target_QueryTarget_size depends on runtime parameters */
diff --git a/Firestore/Protos/nanopb/google/firestore/v1/query.nanopb.cc b/Firestore/Protos/nanopb/google/firestore/v1/query.nanopb.cc
@@ -15,7 +15,7 @@
  */
 
 /* Automatically generated nanopb constant definitions */
-/* Generated by nanopb-0.3.9.1 */
+/* Generated by nanopb-0.3.9.2 */
 
 #include "query.nanopb.h"
 
diff --git a/Firestore/Protos/nanopb/google/firestore/v1/query.nanopb.h b/Firestore/Protos/nanopb/google/firestore/v1/query.nanopb.h
@@ -15,7 +15,7 @@
  */
 
 /* Automatically generated nanopb header */
-/* Generated by nanopb-0.3.9.1 */
+/* Generated by nanopb-0.3.9.2 */
 
 #ifndef PB_GOOGLE_FIRESTORE_V1_QUERY_NANOPB_H_INCLUDED
 #define PB_GOOGLE_FIRESTORE_V1_QUERY_NANOPB_H_INCLUDED
@@ -221,11 +221,11 @@ extern const pb_field_t google_firestore_v1_Cursor_fields[3];
 /* Maximum encoded size of messages (where known) */
 /* google_firestore_v1_StructuredQuery_size depends on runtime parameters */
 /* google_firestore_v1_StructuredQuery_CollectionSelector_size depends on runtime parameters */
-#define google_firestore_v1_StructuredQuery_Filter_size (0 + (((google_firestore_v1_StructuredQuery_UnaryFilter_size > google_firestore_v1_StructuredQuery_CompositeFilter_size ? google_firestore_v1_StructuredQuery_UnaryFilter_size : google_firestore_v1_StructuredQuery_CompositeFilter_size) > google_firestore_v1_StructuredQuery_FieldFilter_size ? (google_firestore_v1_StructuredQuery_UnaryFilter_size > google_firestore_v1_StructuredQuery_CompositeFilter_size ? google_firestore_v1_StructuredQuery_UnaryFilter_size : google_firestore_v1_StructuredQuery_CompositeFilter_size) : google_firestore_v1_StructuredQuery_FieldFilter_size) > 0 ? ((google_firestore_v1_StructuredQuery_UnaryFilter_size > google_firestore_v1_StructuredQuery_CompositeFilter_size ? google_firestore_v1_StructuredQuery_UnaryFilter_size : google_firestore_v1_StructuredQuery_CompositeFilter_size) > google_firestore_v1_StructuredQuery_FieldFilter_size ? (google_firestore_v1_StructuredQuery_UnaryFilter_size > google_firestore_v1_StructuredQuery_CompositeFilter_size ? google_firestore_v1_StructuredQuery_UnaryFilter_size : google_firestore_v1_StructuredQuery_CompositeFilter_size) : google_firestore_v1_StructuredQuery_FieldFilter_size) : 0))
+/* google_firestore_v1_StructuredQuery_Filter_size depends on runtime parameters */
 /* google_firestore_v1_StructuredQuery_CompositeFilter_size depends on runtime parameters */
-#define google_firestore_v1_StructuredQuery_FieldFilter_size (14 + google_firestore_v1_StructuredQuery_FieldReference_size + google_firestore_v1_Value_size)
-#define google_firestore_v1_StructuredQuery_UnaryFilter_size (2 + (google_firestore_v1_StructuredQuery_FieldReference_size > 0 ? google_firestore_v1_StructuredQuery_FieldReference_size : 0))
-#define google_firestore_v1_StructuredQuery_Order_size (8 + google_firestore_v1_StructuredQuery_FieldReference_size)
+/* google_firestore_v1_StructuredQuery_FieldFilter_size depends on runtime parameters */
+/* google_firestore_v1_StructuredQuery_UnaryFilter_size depends on runtime parameters */
+/* google_firestore_v1_StructuredQuery_Order_size depends on runtime parameters */
 /* google_firestore_v1_StructuredQuery_FieldReference_size depends on runtime parameters */
 /* google_firestore_v1_StructuredQuery_Projection_size depends on runtime parameters */
 /* google_firestore_v1_Cursor_size depends on runtime parameters */
diff --git a/Firestore/Protos/nanopb/google/firestore/v1/write.nanopb.cc b/Firestore/Protos/nanopb/google/firestore/v1/write.nanopb.cc
@@ -15,7 +15,7 @@
  */
 
 /* Automatically generated nanopb constant definitions */
-/* Generated by nanopb-0.3.9.1 */
+/* Generated by nanopb-0.3.9.2 */
 
 #include "write.nanopb.h"
 
diff --git a/Firestore/Protos/nanopb/google/firestore/v1/write.nanopb.h b/Firestore/Protos/nanopb/google/firestore/v1/write.nanopb.h
@@ -15,7 +15,7 @@
  */
 
 /* Automatically generated nanopb header */
-/* Generated by nanopb-0.3.9.1 */
+/* Generated by nanopb-0.3.9.2 */
 
 #ifndef PB_GOOGLE_FIRESTORE_V1_WRITE_NANOPB_H_INCLUDED
 #define PB_GOOGLE_FIRESTORE_V1_WRITE_NANOPB_H_INCLUDED
diff --git a/Firestore/Protos/nanopb/google/protobuf/any.nanopb.cc b/Firestore/Protos/nanopb/google/protobuf/any.nanopb.cc
@@ -15,7 +15,7 @@
  */
 
 /* Automatically generated nanopb constant definitions */
-/* Generated by nanopb-0.3.9.1 */
+/* Generated by nanopb-0.3.9.2 */
 
 #include "any.nanopb.h"
 
diff --git a/Firestore/Protos/nanopb/google/protobuf/any.nanopb.h b/Firestore/Protos/nanopb/google/protobuf/any.nanopb.h
@@ -15,7 +15,7 @@
  */
 
 /* Automatically generated nanopb header */
-/* Generated by nanopb-0.3.9.1 */
+/* Generated by nanopb-0.3.9.2 */
 
 #ifndef PB_GOOGLE_PROTOBUF_ANY_NANOPB_H_INCLUDED
 #define PB_GOOGLE_PROTOBUF_ANY_NANOPB_H_INCLUDED
diff --git a/Firestore/Protos/nanopb/google/protobuf/empty.nanopb.cc b/Firestore/Protos/nanopb/google/protobuf/empty.nanopb.cc
@@ -15,7 +15,7 @@
  */
 
 /* Automatically generated nanopb constant definitions */
-/* Generated by nanopb-0.3.9.1 */
+/* Generated by nanopb-0.3.9.2 */
 
 #include "empty.nanopb.h"
 
diff --git a/Firestore/Protos/nanopb/google/protobuf/empty.nanopb.h b/Firestore/Protos/nanopb/google/protobuf/empty.nanopb.h
@@ -15,7 +15,7 @@
  */
 
 /* Automatically generated nanopb header */
-/* Generated by nanopb-0.3.9.1 */
+/* Generated by nanopb-0.3.9.2 */
 
 #ifndef PB_GOOGLE_PROTOBUF_EMPTY_NANOPB_H_INCLUDED
 #define PB_GOOGLE_PROTOBUF_EMPTY_NANOPB_H_INCLUDED
diff --git a/Firestore/Protos/nanopb/google/protobuf/struct.nanopb.cc b/Firestore/Protos/nanopb/google/protobuf/struct.nanopb.cc
@@ -15,7 +15,7 @@
  */
 
 /* Automatically generated nanopb constant definitions */
-/* Generated by nanopb-0.3.9.1 */
+/* Generated by nanopb-0.3.9.2 */
 
 #include "struct.nanopb.h"
 
diff --git a/Firestore/Protos/nanopb/google/protobuf/struct.nanopb.h b/Firestore/Protos/nanopb/google/protobuf/struct.nanopb.h
@@ -15,7 +15,7 @@
  */
 
 /* Automatically generated nanopb header */
-/* Generated by nanopb-0.3.9.1 */
+/* Generated by nanopb-0.3.9.2 */
 
 #ifndef PB_GOOGLE_PROTOBUF_STRUCT_NANOPB_H_INCLUDED
 #define PB_GOOGLE_PROTOBUF_STRUCT_NANOPB_H_INCLUDED
diff --git a/Firestore/Protos/nanopb/google/protobuf/timestamp.nanopb.cc b/Firestore/Protos/nanopb/google/protobuf/timestamp.nanopb.cc
@@ -15,7 +15,7 @@
  */
 
 /* Automatically generated nanopb constant definitions */
-/* Generated by nanopb-0.3.9.1 */
+/* Generated by nanopb-0.3.9.2 */
 
 #include "timestamp.nanopb.h"
 
diff --git a/Firestore/Protos/nanopb/google/protobuf/timestamp.nanopb.h b/Firestore/Protos/nanopb/google/protobuf/timestamp.nanopb.h
@@ -15,7 +15,7 @@
  */
 
 /* Automatically generated nanopb header */
-/* Generated by nanopb-0.3.9.1 */
+/* Generated by nanopb-0.3.9.2 */
 
 #ifndef PB_GOOGLE_PROTOBUF_TIMESTAMP_NANOPB_H_INCLUDED
 #define PB_GOOGLE_PROTOBUF_TIMESTAMP_NANOPB_H_INCLUDED
diff --git a/Firestore/Protos/nanopb/google/protobuf/wrappers.nanopb.cc b/Firestore/Protos/nanopb/google/protobuf/wrappers.nanopb.cc
@@ -15,7 +15,7 @@
  */
 
 /* Automatically generated nanopb constant definitions */
-/* Generated by nanopb-0.3.9.1 */
+/* Generated by nanopb-0.3.9.2 */
 
 #include "wrappers.nanopb.h"
 
diff --git a/Firestore/Protos/nanopb/google/protobuf/wrappers.nanopb.h b/Firestore/Protos/nanopb/google/protobuf/wrappers.nanopb.h
@@ -15,7 +15,7 @@
  */
 
 /* Automatically generated nanopb header */
-/* Generated by nanopb-0.3.9.1 */
+/* Generated by nanopb-0.3.9.2 */
 
 #ifndef PB_GOOGLE_PROTOBUF_WRAPPERS_NANOPB_H_INCLUDED
 #define PB_GOOGLE_PROTOBUF_WRAPPERS_NANOPB_H_INCLUDED
diff --git a/Firestore/Protos/nanopb/google/rpc/status.nanopb.cc b/Firestore/Protos/nanopb/google/rpc/status.nanopb.cc
@@ -15,7 +15,7 @@
  */
 
 /* Automatically generated nanopb constant definitions */
-/* Generated by nanopb-0.3.9.1 */
+/* Generated by nanopb-0.3.9.2 */
 
 #include "status.nanopb.h"
 
diff --git a/Firestore/Protos/nanopb/google/rpc/status.nanopb.h b/Firestore/Protos/nanopb/google/rpc/status.nanopb.h
@@ -15,7 +15,7 @@
  */
 
 /* Automatically generated nanopb header */
-/* Generated by nanopb-0.3.9.1 */
+/* Generated by nanopb-0.3.9.2 */
 
 #ifndef PB_GOOGLE_RPC_STATUS_NANOPB_H_INCLUDED
 #define PB_GOOGLE_RPC_STATUS_NANOPB_H_INCLUDED
diff --git a/Firestore/Protos/nanopb/google/type/latlng.nanopb.cc b/Firestore/Protos/nanopb/google/type/latlng.nanopb.cc
@@ -15,7 +15,7 @@
  */
 
 /* Automatically generated nanopb constant definitions */
-/* Generated by nanopb-0.3.9.1 */
+/* Generated by nanopb-0.3.9.2 */
 
 #include "latlng.nanopb.h"
 
diff --git a/Firestore/Protos/nanopb/google/type/latlng.nanopb.h b/Firestore/Protos/nanopb/google/type/latlng.nanopb.h
@@ -15,7 +15,7 @@
  */
 
 /* Automatically generated nanopb header */
-/* Generated by nanopb-0.3.9.1 */
+/* Generated by nanopb-0.3.9.2 */
 
 #ifndef PB_GOOGLE_TYPE_LATLNG_NANOPB_H_INCLUDED
 #define PB_GOOGLE_TYPE_LATLNG_NANOPB_H_INCLUDED
diff --git a/Firestore/core/src/firebase/firestore/local/CMakeLists.txt b/Firestore/core/src/firebase/firestore/local/CMakeLists.txt
@@ -34,7 +34,7 @@ if(HAVE_LEVELDB)
       leveldb_util.h
     DEPENDS
       # TODO(b/111328563) Force nanopb first to work around ODR violations
-      protobuf-nanopb
+      protobuf-nanopb-static
 
       LevelDB::LevelDB
       absl_strings
@@ -79,7 +79,7 @@ cc_library(
     remote_document_cache.h
   DEPENDS
     # TODO(b/111328563) Force nanopb first to work around ODR violations
-    protobuf-nanopb
+    protobuf-nanopb-static
 
     ${FIREBASE_FIRESTORE_LOCAL_PERSISTENCE}
     absl_strings
diff --git a/Firestore/core/src/firebase/firestore/nanopb/CMakeLists.txt b/Firestore/core/src/firebase/firestore/nanopb/CMakeLists.txt
@@ -23,7 +23,7 @@ cc_library(
     writer.cc
   DEPENDS
     # TODO(b/111328563) Force nanopb first to work around ODR violations
-    protobuf-nanopb
+    protobuf-nanopb-static
 
     firebase_firestore_util
     firebase_firestore_protos_nanopb
diff --git a/Firestore/core/src/firebase/firestore/remote/CMakeLists.txt b/Firestore/core/src/firebase/firestore/remote/CMakeLists.txt
diff --git a/cmake/external/nanopb.cmake b/cmake/external/nanopb.cmake

Original file line number	Diff line number	Diff line change
`@@ -202,12 +202,12 @@ set(nanopb_MSVC_STATIC_RUNTIME OFF CACHE BOOL "Link static runtime libraries")`
`202`	`202`	`add_external_subdirectory(nanopb)`
`203`	`203`
`204`	`204`	`target_compile_definitions(`
`205`		`- protobuf-nanopb`
	`205`	`+ protobuf-nanopb-static`
`206`	`206`	`PUBLIC -DPB_FIELD_32BIT -DPB_ENABLE_MALLOC`
`207`	`207`	`)`
`208`	`208`
`209`	`209`	`target_include_directories(`
`210`		`- protobuf-nanopb`
	`210`	`+ protobuf-nanopb-static`
`211`	`211`	`INTERFACE $<BUILD_INTERFACE:${FIREBASE_EXTERNAL_SOURCE_DIR}/nanopb>`
`212`	`212`	`)`
`213`	`213`
Original file line number	Diff line number	Diff line change
`@@ -144,7 +144,7 @@ cc_library(`
`144`	`144`	`SOURCES`
`145`	`145`	`${NANOPB_GENERATED_SOURCES}`
`146`	`146`	`DEPENDS`
`147`		`- protobuf-nanopb`
	`147`	`+ protobuf-nanopb-static`
`148`	`148`	`)`
`149`	`149`
`150`	`150`	`target_include_directories(`