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

Unified Diff: third_party/android_protobuf/BUILD.gn

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
« no previous file with comments | « DEPS ('k') | third_party/android_protobuf/README.chromium » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/android_protobuf/BUILD.gn
diff --git a/third_party/android_protobuf/BUILD.gn b/third_party/android_protobuf/BUILD.gn
index 7863b07992999b93543e00d85b077becdcda45fb..2a07fc2c7f9d804fc75f4650305001f807f85e5c 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",
« no previous file with comments | « DEPS ('k') | third_party/android_protobuf/README.chromium » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698