Roll src/third_party/android_protobuf 94f522f9:999188d0

Required for use of the cardboard-java library.

src/third_party/cacheinvalidation/src/proto/android_channel.proto must be updated to include "option allow_alias = true;" in the MajorVersion enum. Otherwise a build-blocking warning about duplicate enum values is raised after this roll.

BUG=389343

Review URL: https://codereview.chromium.org/1149283005

Cr-Commit-Position: refs/heads/master@{#334064}

3 files changed, 27 insertions, 2 deletions

diff --git a/third_party/android_protobuf/BUILD.gn b/third_party/android_protobuf/BUILD.gn
index 7863b079..2a07fc2 100644
--- a/third_party/android_protobuf/BUILD.gn
+++ b/third_party/android_protobuf/BUILD.gn
@@ -28,17 +28,24 @@ if (current_toolchain == host_toolchain) {
       "src/src/google/protobuf/compiler/cpp/cpp_service.cc",
       "src/src/google/protobuf/compiler/cpp/cpp_string_field.cc",
       "src/src/google/protobuf/compiler/importer.cc",
+      "src/src/google/protobuf/compiler/java/java_context.cc",
+      "src/src/google/protobuf/compiler/java/java_doc_comment.cc",
       "src/src/google/protobuf/compiler/java/java_enum.cc",
       "src/src/google/protobuf/compiler/java/java_enum_field.cc",
       "src/src/google/protobuf/compiler/java/java_extension.cc",
       "src/src/google/protobuf/compiler/java/java_field.cc",
       "src/src/google/protobuf/compiler/java/java_file.cc",
       "src/src/google/protobuf/compiler/java/java_generator.cc",
+      "src/src/google/protobuf/compiler/java/java_generator_factory.cc",
       "src/src/google/protobuf/compiler/java/java_helpers.cc",
+      "src/src/google/protobuf/compiler/java/java_lazy_message_field.cc",
       "src/src/google/protobuf/compiler/java/java_message.cc",
       "src/src/google/protobuf/compiler/java/java_message_field.cc",
+      "src/src/google/protobuf/compiler/java/java_name_resolver.cc",
       "src/src/google/protobuf/compiler/java/java_primitive_field.cc",
       "src/src/google/protobuf/compiler/java/java_service.cc",
+      "src/src/google/protobuf/compiler/java/java_shared_code_generator.cc",
+      "src/src/google/protobuf/compiler/java/java_string_field.cc",
       "src/src/google/protobuf/compiler/javamicro/javamicro_enum.cc",
       "src/src/google/protobuf/compiler/javamicro/javamicro_enum_field.cc",
       "src/src/google/protobuf/compiler/javamicro/javamicro_field.cc",
@@ -76,6 +83,7 @@ if (current_toolchain == host_toolchain) {
       "src/src/google/protobuf/io/coded_stream.cc",
       "src/src/google/protobuf/io/gzip_stream.cc",
       "src/src/google/protobuf/io/printer.cc",
+      "src/src/google/protobuf/io/strtod.cc",
       "src/src/google/protobuf/io/tokenizer.cc",
       "src/src/google/protobuf/io/zero_copy_stream.cc",
       "src/src/google/protobuf/io/zero_copy_stream_impl.cc",
@@ -85,9 +93,12 @@ if (current_toolchain == host_toolchain) {
       "src/src/google/protobuf/reflection_ops.cc",
       "src/src/google/protobuf/repeated_field.cc",
       "src/src/google/protobuf/service.cc",
+      "src/src/google/protobuf/stubs/atomicops_internals_x86_gcc.cc",
+      "src/src/google/protobuf/stubs/atomicops_internals_x86_msvc.cc",
       "src/src/google/protobuf/stubs/common.cc",
       "src/src/google/protobuf/stubs/hash.cc",
       "src/src/google/protobuf/stubs/once.cc",
+      "src/src/google/protobuf/stubs/stringprintf.cc",
       "src/src/google/protobuf/stubs/structurally_valid.cc",
       "src/src/google/protobuf/stubs/strutil.cc",
       "src/src/google/protobuf/stubs/substitute.cc",
@@ -127,6 +138,8 @@ if (is_android) {
       "src/java/src/main/java/com/google/protobuf/nano/CodedOutputByteBufferNano.java",
       "src/java/src/main/java/com/google/protobuf/nano/ExtendableMessageNano.java",
       "src/java/src/main/java/com/google/protobuf/nano/Extension.java",
+      "src/java/src/main/java/com/google/protobuf/nano/FieldArray.java",
+      "src/java/src/main/java/com/google/protobuf/nano/FieldData.java",
       "src/java/src/main/java/com/google/protobuf/nano/InternalNano.java",
       "src/java/src/main/java/com/google/protobuf/nano/InvalidProtocolBufferNanoException.java",
       "src/java/src/main/java/com/google/protobuf/nano/MessageNano.java",
diff --git a/third_party/android_protobuf/README.chromium b/third_party/android_protobuf/README.chromium
index 26e6436..358088c 100644
--- a/third_party/android_protobuf/README.chromium
+++ b/third_party/android_protobuf/README.chromium
@@ -2,9 +2,9 @@ Name: Protocol Buffers - Google's data interchange format
 Short Name: protobuf
 URL: https://android.googlesource.com/platform/external/protobuf.git
 Version: 2.2.0a
-Revision: L-preview
+Revision: M-preview
 License: BSD
-License File: src/COPYING.txt
+License File: src/LICENSE
 Security Critical: no
 
 Description:
diff --git a/third_party/android_protobuf/android_protobuf.gyp b/third_party/android_protobuf/android_protobuf.gyp
index 5d1f101..9d7061bc 100644
--- a/third_party/android_protobuf/android_protobuf.gyp
+++ b/third_party/android_protobuf/android_protobuf.gyp
@@ -14,6 +14,7 @@
             # does not have a src/ subfolder.
             'java_in_dir': '../../build/android/empty',
             'additional_src_dirs': [ 'src/java/src/main/java/com/google/protobuf/nano' ],
+            'run_findbugs': 0,
           },
           'includes': [ '../../build/java.gypi' ],
         },
@@ -64,17 +65,24 @@
             'src/src/google/protobuf/compiler/cpp/cpp_primitive_field.cc',
             'src/src/google/protobuf/compiler/cpp/cpp_service.cc',
             'src/src/google/protobuf/compiler/cpp/cpp_string_field.cc',
+            'src/src/google/protobuf/compiler/java/java_context.cc',
+            'src/src/google/protobuf/compiler/java/java_doc_comment.cc',
             'src/src/google/protobuf/compiler/java/java_enum.cc',
             'src/src/google/protobuf/compiler/java/java_enum_field.cc',
             'src/src/google/protobuf/compiler/java/java_extension.cc',
             'src/src/google/protobuf/compiler/java/java_field.cc',
             'src/src/google/protobuf/compiler/java/java_file.cc',
             'src/src/google/protobuf/compiler/java/java_generator.cc',
+            'src/src/google/protobuf/compiler/java/java_generator_factory.cc',
             'src/src/google/protobuf/compiler/java/java_helpers.cc',
+            'src/src/google/protobuf/compiler/java/java_lazy_message_field.cc',
             'src/src/google/protobuf/compiler/java/java_message.cc',
             'src/src/google/protobuf/compiler/java/java_message_field.cc',
+            'src/src/google/protobuf/compiler/java/java_name_resolver.cc',
             'src/src/google/protobuf/compiler/java/java_primitive_field.cc',
             'src/src/google/protobuf/compiler/java/java_service.cc',
+            'src/src/google/protobuf/compiler/java/java_shared_code_generator.cc',
+            'src/src/google/protobuf/compiler/java/java_string_field.cc',
             'src/src/google/protobuf/compiler/javamicro/javamicro_enum.cc',
             'src/src/google/protobuf/compiler/javamicro/javamicro_enum_field.cc',
             'src/src/google/protobuf/compiler/javamicro/javamicro_field.cc',
@@ -98,13 +106,17 @@
             'src/src/google/protobuf/io/coded_stream.cc',
             'src/src/google/protobuf/io/gzip_stream.cc',
             'src/src/google/protobuf/io/printer.cc',
+            'src/src/google/protobuf/io/strtod.cc',
             'src/src/google/protobuf/io/tokenizer.cc',
             'src/src/google/protobuf/io/zero_copy_stream.cc',
             'src/src/google/protobuf/io/zero_copy_stream_impl.cc',
             'src/src/google/protobuf/io/zero_copy_stream_impl_lite.cc',
+            'src/src/google/protobuf/stubs/atomicops_internals_x86_gcc.cc',
+            'src/src/google/protobuf/stubs/atomicops_internals_x86_msvc.cc',
             'src/src/google/protobuf/stubs/common.cc',
             'src/src/google/protobuf/stubs/hash.cc',
             'src/src/google/protobuf/stubs/once.cc',
+            'src/src/google/protobuf/stubs/stringprintf.cc',
             'src/src/google/protobuf/stubs/structurally_valid.cc',
             'src/src/google/protobuf/stubs/strutil.cc',
             'src/src/google/protobuf/stubs/substitute.cc',