Roll src/third_party/android_protobuf 94f522f9:999188d0

third_party/android_protobuf/android_protobuf.gyp

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'conditions': [
     ['OS=="android"', {
       'targets': [
         {
           'target_name': 'protobuf_nano_javalib',
           'type' : 'none',
           'variables': {
             # Using empty dir and additionalk_src_dirs since the nano package
             # does not have a src/ subfolder.
             'java_in_dir': '../../build/android/empty',
             'additional_src_dirs': [ 'src/java/src/main/java/com/google/protobuf/nano' ],

[jbudorick, 2015/06/11 19:31:56]

I think you can just add

  'run_findbugs': 0

here instead of adding to the exclusion file.

           },
           'includes': [ '../../build/java.gypi' ],
         },
         {
           # This proto compiler supports the nano profile, but should only be used for Android.
           'target_name': 'android_protoc',
           'type': 'executable',
           'variables': {
             'chromium_code': 0,
           },
@@ skipping 30 matching lines @@
             'src/src/google/protobuf/compiler/cpp/cpp_extension.cc',
             'src/src/google/protobuf/compiler/cpp/cpp_field.cc',
             'src/src/google/protobuf/compiler/cpp/cpp_file.cc',
             'src/src/google/protobuf/compiler/cpp/cpp_generator.cc',
             'src/src/google/protobuf/compiler/cpp/cpp_helpers.cc',
             'src/src/google/protobuf/compiler/cpp/cpp_message.cc',
             'src/src/google/protobuf/compiler/cpp/cpp_message_field.cc',
             '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',
             'src/src/google/protobuf/compiler/javamicro/javamicro_file.cc',
             'src/src/google/protobuf/compiler/javamicro/javamicro_generator.cc',
             'src/src/google/protobuf/compiler/javamicro/javamicro_helpers.cc',
             'src/src/google/protobuf/compiler/javamicro/javamicro_message.cc',
             'src/src/google/protobuf/compiler/javamicro/javamicro_message_field.cc',
             'src/src/google/protobuf/compiler/javamicro/javamicro_primitive_field.cc',
             'src/src/google/protobuf/compiler/javanano/javanano_enum.cc',
             'src/src/google/protobuf/compiler/javanano/javanano_enum_field.cc',
             'src/src/google/protobuf/compiler/javanano/javanano_extension.cc',
             'src/src/google/protobuf/compiler/javanano/javanano_field.cc',
             'src/src/google/protobuf/compiler/javanano/javanano_file.cc',
             'src/src/google/protobuf/compiler/javanano/javanano_generator.cc',
             'src/src/google/protobuf/compiler/javanano/javanano_helpers.cc',
             'src/src/google/protobuf/compiler/javanano/javanano_message.cc',
             'src/src/google/protobuf/compiler/javanano/javanano_message_field.cc',
             'src/src/google/protobuf/compiler/javanano/javanano_primitive_field.cc',
             'src/src/google/protobuf/compiler/python/python_generator.cc',
             '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',
           ],
           'include_dirs': [
             'src/android',
             'src/src',
           ],
           'cflags': [
             '-Wno-null-conversion',
             '-Wno-tautological-undefined-compare',
           ],
           'defines': [
             # This macro must be defined to suppress the use
             # of dynamic_cast<>, which requires RTTI.
             'GOOGLE_PROTOBUF_NO_RTTI',
             'GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER',
           ],
           'dependencies': [
             '../zlib/zlib.gyp:zlib',
           ],
         },
       ],
     }],
   ],
 }