diff options
author | Xiao Hang <rocking@google.com> | 2015-08-04 15:07:44 -0700 |
---|---|---|
committer | Xiao Hang <rocking@google.com> | 2015-08-04 15:07:44 -0700 |
commit | 9fd0f1526fab9ee9b7e9d021185bc3507048a6d2 (patch) | |
tree | a10acdb4210cf4d7dc770db88efc694aa35ec1de /BUILD | |
parent | f5a3abc20487e423a7b3b2e13ad630e2d5026895 (diff) | |
parent | dc80689af3951d078cb556588eece89dd6860c91 (diff) | |
download | protobuf-9fd0f1526fab9ee9b7e9d021185bc3507048a6d2.tar.gz protobuf-9fd0f1526fab9ee9b7e9d021185bc3507048a6d2.tar.bz2 protobuf-9fd0f1526fab9ee9b7e9d021185bc3507048a6d2.zip |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'BUILD')
-rw-r--r-- | BUILD | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -162,10 +162,10 @@ cc_library( "src/google/protobuf/compiler/cpp/cpp_string_field.cc", "src/google/protobuf/compiler/csharp/csharp_enum.cc", "src/google/protobuf/compiler/csharp/csharp_enum_field.cc", - "src/google/protobuf/compiler/csharp/csharp_extension.cc", "src/google/protobuf/compiler/csharp/csharp_field_base.cc", "src/google/protobuf/compiler/csharp/csharp_generator.cc", "src/google/protobuf/compiler/csharp/csharp_helpers.cc", + "src/google/protobuf/compiler/csharp/csharp_map_field.cc", "src/google/protobuf/compiler/csharp/csharp_message.cc", "src/google/protobuf/compiler/csharp/csharp_message_field.cc", "src/google/protobuf/compiler/csharp/csharp_primitive_field.cc", @@ -174,7 +174,7 @@ cc_library( "src/google/protobuf/compiler/csharp/csharp_repeated_primitive_field.cc", "src/google/protobuf/compiler/csharp/csharp_source_generator_base.cc", "src/google/protobuf/compiler/csharp/csharp_umbrella_class.cc", - "src/google/protobuf/compiler/csharp/csharp_writer.cc", + "src/google/protobuf/compiler/csharp/csharp_wrapper_field.cc", "src/google/protobuf/compiler/java/java_context.cc", "src/google/protobuf/compiler/java/java_doc_comment.cc", "src/google/protobuf/compiler/java/java_enum.cc", |