un yapf protoc_lib_deps

2 files changed, 7 insertions, 164 deletions

diff --git a/tools/distrib/python/grpcio_tools/protoc_lib_deps.py b/tools/distrib/python/grpcio_tools/protoc_lib_deps.py
index a900fb89ec..2c65fca628 100644
--- a/tools/distrib/python/grpcio_tools/protoc_lib_deps.py
+++ b/tools/distrib/python/grpcio_tools/protoc_lib_deps.py
@@ -1,3 +1,4 @@
+
 # Copyright 2017 gRPC authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,169 +14,10 @@
 # limitations under the License.
 
 # AUTO-GENERATED BY make_grpcio_tools.py!
-CC_FILES = [
-    'google/protobuf/compiler/zip_writer.cc',
-    'google/protobuf/compiler/subprocess.cc',
-    'google/protobuf/compiler/ruby/ruby_generator.cc',
-    'google/protobuf/compiler/python/python_generator.cc',
-    'google/protobuf/compiler/plugin.pb.cc',
-    'google/protobuf/compiler/plugin.cc',
-    'google/protobuf/compiler/php/php_generator.cc',
-    'google/protobuf/compiler/objectivec/objectivec_primitive_field.cc',
-    'google/protobuf/compiler/objectivec/objectivec_oneof.cc',
-    'google/protobuf/compiler/objectivec/objectivec_message_field.cc',
-    'google/protobuf/compiler/objectivec/objectivec_message.cc',
-    'google/protobuf/compiler/objectivec/objectivec_map_field.cc',
-    'google/protobuf/compiler/objectivec/objectivec_helpers.cc',
-    'google/protobuf/compiler/objectivec/objectivec_generator.cc',
-    'google/protobuf/compiler/objectivec/objectivec_file.cc',
-    'google/protobuf/compiler/objectivec/objectivec_field.cc',
-    'google/protobuf/compiler/objectivec/objectivec_extension.cc',
-    'google/protobuf/compiler/objectivec/objectivec_enum_field.cc',
-    'google/protobuf/compiler/objectivec/objectivec_enum.cc',
-    'google/protobuf/compiler/js/well_known_types_embed.cc',
-    'google/protobuf/compiler/js/js_generator.cc',
-    'google/protobuf/compiler/javanano/javanano_primitive_field.cc',
-    'google/protobuf/compiler/javanano/javanano_message_field.cc',
-    'google/protobuf/compiler/javanano/javanano_message.cc',
-    'google/protobuf/compiler/javanano/javanano_map_field.cc',
-    'google/protobuf/compiler/javanano/javanano_helpers.cc',
-    'google/protobuf/compiler/javanano/javanano_generator.cc',
-    'google/protobuf/compiler/javanano/javanano_file.cc',
-    'google/protobuf/compiler/javanano/javanano_field.cc',
-    'google/protobuf/compiler/javanano/javanano_extension.cc',
-    'google/protobuf/compiler/javanano/javanano_enum_field.cc',
-    'google/protobuf/compiler/javanano/javanano_enum.cc',
-    'google/protobuf/compiler/java/java_string_field_lite.cc',
-    'google/protobuf/compiler/java/java_string_field.cc',
-    'google/protobuf/compiler/java/java_shared_code_generator.cc',
-    'google/protobuf/compiler/java/java_service.cc',
-    'google/protobuf/compiler/java/java_primitive_field_lite.cc',
-    'google/protobuf/compiler/java/java_primitive_field.cc',
-    'google/protobuf/compiler/java/java_name_resolver.cc',
-    'google/protobuf/compiler/java/java_message_lite.cc',
-    'google/protobuf/compiler/java/java_message_field_lite.cc',
-    'google/protobuf/compiler/java/java_message_field.cc',
-    'google/protobuf/compiler/java/java_message_builder_lite.cc',
-    'google/protobuf/compiler/java/java_message_builder.cc',
-    'google/protobuf/compiler/java/java_message.cc',
-    'google/protobuf/compiler/java/java_map_field_lite.cc',
-    'google/protobuf/compiler/java/java_map_field.cc',
-    'google/protobuf/compiler/java/java_lazy_message_field_lite.cc',
-    'google/protobuf/compiler/java/java_lazy_message_field.cc',
-    'google/protobuf/compiler/java/java_helpers.cc',
-    'google/protobuf/compiler/java/java_generator_factory.cc',
-    'google/protobuf/compiler/java/java_generator.cc',
-    'google/protobuf/compiler/java/java_file.cc',
-    'google/protobuf/compiler/java/java_field.cc',
-    'google/protobuf/compiler/java/java_extension_lite.cc',
-    'google/protobuf/compiler/java/java_extension.cc',
-    'google/protobuf/compiler/java/java_enum_lite.cc',
-    'google/protobuf/compiler/java/java_enum_field_lite.cc',
-    'google/protobuf/compiler/java/java_enum_field.cc',
-    'google/protobuf/compiler/java/java_enum.cc',
-    'google/protobuf/compiler/java/java_doc_comment.cc',
-    'google/protobuf/compiler/java/java_context.cc',
-    'google/protobuf/compiler/csharp/csharp_wrapper_field.cc',
-    'google/protobuf/compiler/csharp/csharp_source_generator_base.cc',
-    'google/protobuf/compiler/csharp/csharp_repeated_primitive_field.cc',
-    'google/protobuf/compiler/csharp/csharp_repeated_message_field.cc',
-    'google/protobuf/compiler/csharp/csharp_repeated_enum_field.cc',
-    'google/protobuf/compiler/csharp/csharp_reflection_class.cc',
-    'google/protobuf/compiler/csharp/csharp_primitive_field.cc',
-    'google/protobuf/compiler/csharp/csharp_message_field.cc',
-    'google/protobuf/compiler/csharp/csharp_message.cc',
-    'google/protobuf/compiler/csharp/csharp_map_field.cc',
-    'google/protobuf/compiler/csharp/csharp_helpers.cc',
-    'google/protobuf/compiler/csharp/csharp_generator.cc',
-    'google/protobuf/compiler/csharp/csharp_field_base.cc',
-    'google/protobuf/compiler/csharp/csharp_enum_field.cc',
-    'google/protobuf/compiler/csharp/csharp_enum.cc',
-    'google/protobuf/compiler/csharp/csharp_doc_comment.cc',
-    'google/protobuf/compiler/cpp/cpp_string_field.cc',
-    'google/protobuf/compiler/cpp/cpp_service.cc',
-    'google/protobuf/compiler/cpp/cpp_primitive_field.cc',
-    'google/protobuf/compiler/cpp/cpp_padding_optimizer.cc',
-    'google/protobuf/compiler/cpp/cpp_message_field.cc',
-    'google/protobuf/compiler/cpp/cpp_message.cc',
-    'google/protobuf/compiler/cpp/cpp_map_field.cc',
-    'google/protobuf/compiler/cpp/cpp_helpers.cc',
-    'google/protobuf/compiler/cpp/cpp_generator.cc',
-    'google/protobuf/compiler/cpp/cpp_file.cc',
-    'google/protobuf/compiler/cpp/cpp_field.cc',
-    'google/protobuf/compiler/cpp/cpp_extension.cc',
-    'google/protobuf/compiler/cpp/cpp_enum_field.cc',
-    'google/protobuf/compiler/cpp/cpp_enum.cc',
-    'google/protobuf/compiler/command_line_interface.cc',
-    'google/protobuf/compiler/code_generator.cc',
-    'google/protobuf/wrappers.pb.cc', 'google/protobuf/wire_format.cc',
-    'google/protobuf/util/type_resolver_util.cc',
-    'google/protobuf/util/time_util.cc',
-    'google/protobuf/util/message_differencer.cc',
-    'google/protobuf/util/json_util.cc',
-    'google/protobuf/util/internal/utility.cc',
-    'google/protobuf/util/internal/type_info_test_helper.cc',
-    'google/protobuf/util/internal/type_info.cc',
-    'google/protobuf/util/internal/protostream_objectwriter.cc',
-    'google/protobuf/util/internal/protostream_objectsource.cc',
-    'google/protobuf/util/internal/proto_writer.cc',
-    'google/protobuf/util/internal/object_writer.cc',
-    'google/protobuf/util/internal/json_stream_parser.cc',
-    'google/protobuf/util/internal/json_objectwriter.cc',
-    'google/protobuf/util/internal/json_escaping.cc',
-    'google/protobuf/util/internal/field_mask_utility.cc',
-    'google/protobuf/util/internal/error_listener.cc',
-    'google/protobuf/util/internal/default_value_objectwriter.cc',
-    'google/protobuf/util/internal/datapiece.cc',
-    'google/protobuf/util/field_mask_util.cc',
-    'google/protobuf/util/field_comparator.cc',
-    'google/protobuf/util/delimited_message_util.cc',
-    'google/protobuf/unknown_field_set.cc', 'google/protobuf/type.pb.cc',
-    'google/protobuf/timestamp.pb.cc', 'google/protobuf/text_format.cc',
-    'google/protobuf/stubs/substitute.cc', 'google/protobuf/stubs/mathlimits.cc',
-    'google/protobuf/struct.pb.cc', 'google/protobuf/source_context.pb.cc',
-    'google/protobuf/service.cc', 'google/protobuf/reflection_ops.cc',
-    'google/protobuf/message.cc', 'google/protobuf/map_field.cc',
-    'google/protobuf/io/zero_copy_stream_impl.cc',
-    'google/protobuf/io/tokenizer.cc', 'google/protobuf/io/strtod.cc',
-    'google/protobuf/io/printer.cc', 'google/protobuf/io/gzip_stream.cc',
-    'google/protobuf/generated_message_table_driven.cc',
-    'google/protobuf/generated_message_reflection.cc',
-    'google/protobuf/field_mask.pb.cc', 'google/protobuf/extension_set_heavy.cc',
-    'google/protobuf/empty.pb.cc', 'google/protobuf/dynamic_message.cc',
-    'google/protobuf/duration.pb.cc', 'google/protobuf/descriptor_database.cc',
-    'google/protobuf/descriptor.pb.cc', 'google/protobuf/descriptor.cc',
-    'google/protobuf/compiler/parser.cc', 'google/protobuf/compiler/importer.cc',
-    'google/protobuf/api.pb.cc', 'google/protobuf/any.pb.cc',
-    'google/protobuf/any.cc', 'google/protobuf/wire_format_lite.cc',
-    'google/protobuf/stubs/time.cc', 'google/protobuf/stubs/strutil.cc',
-    'google/protobuf/stubs/structurally_valid.cc',
-    'google/protobuf/stubs/stringprintf.cc',
-    'google/protobuf/stubs/stringpiece.cc', 'google/protobuf/stubs/statusor.cc',
-    'google/protobuf/stubs/status.cc', 'google/protobuf/stubs/once.cc',
-    'google/protobuf/stubs/io_win32.cc', 'google/protobuf/stubs/int128.cc',
-    'google/protobuf/stubs/common.cc', 'google/protobuf/stubs/bytestream.cc',
-    'google/protobuf/stubs/atomicops_internals_x86_msvc.cc',
-    'google/protobuf/stubs/atomicops_internals_x86_gcc.cc',
-    'google/protobuf/repeated_field.cc', 'google/protobuf/message_lite.cc',
-    'google/protobuf/io/zero_copy_stream_impl_lite.cc',
-    'google/protobuf/io/zero_copy_stream.cc',
-    'google/protobuf/io/coded_stream.cc',
-    'google/protobuf/generated_message_util.cc',
-    'google/protobuf/generated_message_table_driven_lite.cc',
-    'google/protobuf/extension_set.cc', 'google/protobuf/arenastring.cc',
-    'google/protobuf/arena.cc', 'google/protobuf/compiler/js/embed.cc'
-]
-PROTO_FILES = [
-    'google/protobuf/wrappers.proto', 'google/protobuf/type.proto',
-    'google/protobuf/timestamp.proto', 'google/protobuf/struct.proto',
-    'google/protobuf/source_context.proto', 'google/protobuf/field_mask.proto',
-    'google/protobuf/empty.proto', 'google/protobuf/duration.proto',
-    'google/protobuf/descriptor.proto', 'google/protobuf/compiler/plugin.proto',
-    'google/protobuf/api.proto', 'google/protobuf/any.proto'
-]
+CC_FILES=['google/protobuf/compiler/zip_writer.cc', 'google/protobuf/compiler/subprocess.cc', 'google/protobuf/compiler/ruby/ruby_generator.cc', 'google/protobuf/compiler/python/python_generator.cc', 'google/protobuf/compiler/plugin.pb.cc', 'google/protobuf/compiler/plugin.cc', 'google/protobuf/compiler/php/php_generator.cc', 'google/protobuf/compiler/objectivec/objectivec_primitive_field.cc', 'google/protobuf/compiler/objectivec/objectivec_oneof.cc', 'google/protobuf/compiler/objectivec/objectivec_message_field.cc', 'google/protobuf/compiler/objectivec/objectivec_message.cc', 'google/protobuf/compiler/objectivec/objectivec_map_field.cc', 'google/protobuf/compiler/objectivec/objectivec_helpers.cc', 'google/protobuf/compiler/objectivec/objectivec_generator.cc', 'google/protobuf/compiler/objectivec/objectivec_file.cc', 'google/protobuf/compiler/objectivec/objectivec_field.cc', 'google/protobuf/compiler/objectivec/objectivec_extension.cc', 'google/protobuf/compiler/objectivec/objectivec_enum_field.cc', 'google/protobuf/compiler/objectivec/objectivec_enum.cc', 'google/protobuf/compiler/js/well_known_types_embed.cc', 'google/protobuf/compiler/js/js_generator.cc', 'google/protobuf/compiler/javanano/javanano_primitive_field.cc', 'google/protobuf/compiler/javanano/javanano_message_field.cc', 'google/protobuf/compiler/javanano/javanano_message.cc', 'google/protobuf/compiler/javanano/javanano_map_field.cc', 'google/protobuf/compiler/javanano/javanano_helpers.cc', 'google/protobuf/compiler/javanano/javanano_generator.cc', 'google/protobuf/compiler/javanano/javanano_file.cc', 'google/protobuf/compiler/javanano/javanano_field.cc', 'google/protobuf/compiler/javanano/javanano_extension.cc', 'google/protobuf/compiler/javanano/javanano_enum_field.cc', 'google/protobuf/compiler/javanano/javanano_enum.cc', 'google/protobuf/compiler/java/java_string_field_lite.cc', 'google/protobuf/compiler/java/java_string_field.cc', 'google/protobuf/compiler/java/java_shared_code_generator.cc', 'google/protobuf/compiler/java/java_service.cc', 'google/protobuf/compiler/java/java_primitive_field_lite.cc', 'google/protobuf/compiler/java/java_primitive_field.cc', 'google/protobuf/compiler/java/java_name_resolver.cc', 'google/protobuf/compiler/java/java_message_lite.cc', 'google/protobuf/compiler/java/java_message_field_lite.cc', 'google/protobuf/compiler/java/java_message_field.cc', 'google/protobuf/compiler/java/java_message_builder_lite.cc', 'google/protobuf/compiler/java/java_message_builder.cc', 'google/protobuf/compiler/java/java_message.cc', 'google/protobuf/compiler/java/java_map_field_lite.cc', 'google/protobuf/compiler/java/java_map_field.cc', 'google/protobuf/compiler/java/java_lazy_message_field_lite.cc', 'google/protobuf/compiler/java/java_lazy_message_field.cc', 'google/protobuf/compiler/java/java_helpers.cc', 'google/protobuf/compiler/java/java_generator_factory.cc', 'google/protobuf/compiler/java/java_generator.cc', 'google/protobuf/compiler/java/java_file.cc', 'google/protobuf/compiler/java/java_field.cc', 'google/protobuf/compiler/java/java_extension_lite.cc', 'google/protobuf/compiler/java/java_extension.cc', 'google/protobuf/compiler/java/java_enum_lite.cc', 'google/protobuf/compiler/java/java_enum_field_lite.cc', 'google/protobuf/compiler/java/java_enum_field.cc', 'google/protobuf/compiler/java/java_enum.cc', 'google/protobuf/compiler/java/java_doc_comment.cc', 'google/protobuf/compiler/java/java_context.cc', 'google/protobuf/compiler/csharp/csharp_wrapper_field.cc', 'google/protobuf/compiler/csharp/csharp_source_generator_base.cc', 'google/protobuf/compiler/csharp/csharp_repeated_primitive_field.cc', 'google/protobuf/compiler/csharp/csharp_repeated_message_field.cc', 'google/protobuf/compiler/csharp/csharp_repeated_enum_field.cc', 'google/protobuf/compiler/csharp/csharp_reflection_class.cc', 'google/protobuf/compiler/csharp/csharp_primitive_field.cc', 'google/protobuf/compiler/csharp/csharp_message_field.cc', 'google/protobuf/compiler/csharp/csharp_message.cc', 'google/protobuf/compiler/csharp/csharp_map_field.cc', 'google/protobuf/compiler/csharp/csharp_helpers.cc', 'google/protobuf/compiler/csharp/csharp_generator.cc', 'google/protobuf/compiler/csharp/csharp_field_base.cc', 'google/protobuf/compiler/csharp/csharp_enum_field.cc', 'google/protobuf/compiler/csharp/csharp_enum.cc', 'google/protobuf/compiler/csharp/csharp_doc_comment.cc', 'google/protobuf/compiler/cpp/cpp_string_field.cc', 'google/protobuf/compiler/cpp/cpp_service.cc', 'google/protobuf/compiler/cpp/cpp_primitive_field.cc', 'google/protobuf/compiler/cpp/cpp_padding_optimizer.cc', 'google/protobuf/compiler/cpp/cpp_message_field.cc', 'google/protobuf/compiler/cpp/cpp_message.cc', 'google/protobuf/compiler/cpp/cpp_map_field.cc', 'google/protobuf/compiler/cpp/cpp_helpers.cc', 'google/protobuf/compiler/cpp/cpp_generator.cc', 'google/protobuf/compiler/cpp/cpp_file.cc', 'google/protobuf/compiler/cpp/cpp_field.cc', 'google/protobuf/compiler/cpp/cpp_extension.cc', 'google/protobuf/compiler/cpp/cpp_enum_field.cc', 'google/protobuf/compiler/cpp/cpp_enum.cc', 'google/protobuf/compiler/command_line_interface.cc', 'google/protobuf/compiler/code_generator.cc', 'google/protobuf/wrappers.pb.cc', 'google/protobuf/wire_format.cc', 'google/protobuf/util/type_resolver_util.cc', 'google/protobuf/util/time_util.cc', 'google/protobuf/util/message_differencer.cc', 'google/protobuf/util/json_util.cc', 'google/protobuf/util/internal/utility.cc', 'google/protobuf/util/internal/type_info_test_helper.cc', 'google/protobuf/util/internal/type_info.cc', 'google/protobuf/util/internal/protostream_objectwriter.cc', 'google/protobuf/util/internal/protostream_objectsource.cc', 'google/protobuf/util/internal/proto_writer.cc', 'google/protobuf/util/internal/object_writer.cc', 'google/protobuf/util/internal/json_stream_parser.cc', 'google/protobuf/util/internal/json_objectwriter.cc', 'google/protobuf/util/internal/json_escaping.cc', 'google/protobuf/util/internal/field_mask_utility.cc', 'google/protobuf/util/internal/error_listener.cc', 'google/protobuf/util/internal/default_value_objectwriter.cc', 'google/protobuf/util/internal/datapiece.cc', 'google/protobuf/util/field_mask_util.cc', 'google/protobuf/util/field_comparator.cc', 'google/protobuf/util/delimited_message_util.cc', 'google/protobuf/unknown_field_set.cc', 'google/protobuf/type.pb.cc', 'google/protobuf/timestamp.pb.cc', 'google/protobuf/text_format.cc', 'google/protobuf/stubs/substitute.cc', 'google/protobuf/stubs/mathlimits.cc', 'google/protobuf/struct.pb.cc', 'google/protobuf/source_context.pb.cc', 'google/protobuf/service.cc', 'google/protobuf/reflection_ops.cc', 'google/protobuf/message.cc', 'google/protobuf/map_field.cc', 'google/protobuf/io/zero_copy_stream_impl.cc', 'google/protobuf/io/tokenizer.cc', 'google/protobuf/io/strtod.cc', 'google/protobuf/io/printer.cc', 'google/protobuf/io/gzip_stream.cc', 'google/protobuf/generated_message_table_driven.cc', 'google/protobuf/generated_message_reflection.cc', 'google/protobuf/field_mask.pb.cc', 'google/protobuf/extension_set_heavy.cc', 'google/protobuf/empty.pb.cc', 'google/protobuf/dynamic_message.cc', 'google/protobuf/duration.pb.cc', 'google/protobuf/descriptor_database.cc', 'google/protobuf/descriptor.pb.cc', 'google/protobuf/descriptor.cc', 'google/protobuf/compiler/parser.cc', 'google/protobuf/compiler/importer.cc', 'google/protobuf/api.pb.cc', 'google/protobuf/any.pb.cc', 'google/protobuf/any.cc', 'google/protobuf/wire_format_lite.cc', 'google/protobuf/stubs/time.cc', 'google/protobuf/stubs/strutil.cc', 'google/protobuf/stubs/structurally_valid.cc', 'google/protobuf/stubs/stringprintf.cc', 'google/protobuf/stubs/stringpiece.cc', 'google/protobuf/stubs/statusor.cc', 'google/protobuf/stubs/status.cc', 'google/protobuf/stubs/once.cc', 'google/protobuf/stubs/io_win32.cc', 'google/protobuf/stubs/int128.cc', 'google/protobuf/stubs/common.cc', 'google/protobuf/stubs/bytestream.cc', 'google/protobuf/stubs/atomicops_internals_x86_msvc.cc', 'google/protobuf/stubs/atomicops_internals_x86_gcc.cc', 'google/protobuf/repeated_field.cc', 'google/protobuf/message_lite.cc', 'google/protobuf/io/zero_copy_stream_impl_lite.cc', 'google/protobuf/io/zero_copy_stream.cc', 'google/protobuf/io/coded_stream.cc', 'google/protobuf/generated_message_util.cc', 'google/protobuf/generated_message_table_driven_lite.cc', 'google/protobuf/extension_set.cc', 'google/protobuf/arenastring.cc', 'google/protobuf/arena.cc', 'google/protobuf/compiler/js/embed.cc']
+PROTO_FILES=['google/protobuf/wrappers.proto', 'google/protobuf/type.proto', 'google/protobuf/timestamp.proto', 'google/protobuf/struct.proto', 'google/protobuf/source_context.proto', 'google/protobuf/field_mask.proto', 'google/protobuf/empty.proto', 'google/protobuf/duration.proto', 'google/protobuf/descriptor.proto', 'google/protobuf/compiler/plugin.proto', 'google/protobuf/api.proto', 'google/protobuf/any.proto']
 
-CC_INCLUDE = 'third_party/protobuf/src'
-PROTO_INCLUDE = 'third_party/protobuf/src'
+CC_INCLUDE='third_party/protobuf/src'
+PROTO_INCLUDE='third_party/protobuf/src'
 
-PROTOBUF_SUBMODULE_VERSION = "2761122b810fe8861004ae785cc3ab39f384d342"
+PROTOBUF_SUBMODULE_VERSION="2761122b810fe8861004ae785cc3ab39f384d342"
diff --git a/tools/distrib/yapf_code.sh b/tools/distrib/yapf_code.sh
index 8196773990..f096868660 100755
--- a/tools/distrib/yapf_code.sh
+++ b/tools/distrib/yapf_code.sh
@@ -23,6 +23,7 @@ DIRS=(
     'tools'
 )
 EXCLUSIONS=(
+    '*protoc_lib_deps.py'  # this file is auto-generated
 )
 
 VIRTUALENV=yapf_virtual_environment