Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1405)

Unified Diff: third_party/android_protobuf/android_protobuf.gyp

Issue 1149283005: Roll src/third_party/android_protobuf 94f522f9:999188d0 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Trying jbudorick@'s suggestion Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/android_protobuf/android_protobuf.gyp
diff --git a/third_party/android_protobuf/android_protobuf.gyp b/third_party/android_protobuf/android_protobuf.gyp
index 5d1f1015833b9b555d60fdbfdd8b97d7b75f270d..9d7061bc136b8bedf01e88eeb75747dc0169e9cc 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',
« no previous file with comments | « third_party/android_protobuf/README.chromium ('k') | third_party/cacheinvalidation/src/proto/android_channel.proto » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698