Down-integrate internal changes to github. (#5575)

* Down-integrate internal changes to github. * Fix BUILD file and regenerate csharp descritpor
protocolbuffers · Jan 14, 2019 · a2a0afb · a2a0afb
1 parent 54683e6
commit a2a0afb
Show file tree

Hide file tree

Showing 69 changed files with 1,012 additions and 1,421 deletions.
diff --git a/BUILD b/BUILD
@@ -93,7 +93,6 @@ cc_library(
     srcs = [
         # AUTOGEN(protobuf_lite_srcs)
         "src/google/protobuf/arena.cc",
-        "src/google/protobuf/arenastring.cc",
         "src/google/protobuf/extension_set.cc",
         "src/google/protobuf/generated_message_table_driven_lite.cc",
         "src/google/protobuf/generated_message_util.cc",

diff --git a/conformance/conformance.proto b/conformance/conformance.proto
@@ -71,7 +71,7 @@ enum TestCategory {
   JSON_IGNORE_UNKNOWN_PARSING_TEST = 3;
   // Test jspb wire format. Google internal only. Opensource testees just skip it.
   JSPB_TEST = 4;
-  // Test text format. For cpp, java and python, testees can already deal with 
+  // Test text format. For cpp, java and python, testees can already deal with
   // this type. Testees of other languages can simply skip it.
   TEXT_FORMAT_TEST = 5;
 }
@@ -169,3 +169,4 @@ message JspbEncodingConfig {
   // Encode the value field of Any as jspb array if ture, otherwise binary.
   bool use_jspb_array_any_format = 1;
 }
+
diff --git a/csharp/src/Google.Protobuf.Conformance/Conformance.cs b/csharp/src/Google.Protobuf.Conformance/Conformance.cs
@@ -93,7 +93,7 @@ public enum TestCategory {
     /// </summary>
     [pbr::OriginalName("JSPB_TEST")] JspbTest = 4,
     /// <summary>
-    /// Test text format. For cpp, java and python, testees can already deal with 
+    /// Test text format. For cpp, java and python, testees can already deal with
     /// this type. Testees of other languages can simply skip it.
     /// </summary>
     [pbr::OriginalName("TEXT_FORMAT_TEST")] TextFormatTest = 5,

diff --git a/src/google/protobuf/any.pb.cc b/src/google/protobuf/any.pb.cc
diff --git a/src/google/protobuf/api.pb.cc b/src/google/protobuf/api.pb.cc