Reland: Split protoc into library and executable.

third_party/protobuf/protobuf.gyp

Index: third_party/protobuf/protobuf.gyp
diff --git a/third_party/protobuf/protobuf.gyp b/third_party/protobuf/protobuf.gyp
index 38ad1aadcba09d1473da29ddc4bf4c4dccac7ccf..e77e17949d7b28d3244386d0df550e6b8fd6111b 100644
--- a/third_party/protobuf/protobuf.gyp
+++ b/third_party/protobuf/protobuf.gyp
@@ -246,206 +246,219 @@
           ],
         },
         {
+          'target_name': 'protoc_lib',
+          'type': 'static_library',
+          'toolsets': ['host'],
+          'sources': [
+            "src/google/protobuf/compiler/code_generator.cc",
+            "src/google/protobuf/compiler/code_generator.h",
+            "src/google/protobuf/compiler/command_line_interface.cc",
+            "src/google/protobuf/compiler/command_line_interface.h",
+            "src/google/protobuf/compiler/cpp/cpp_enum.cc",
+            "src/google/protobuf/compiler/cpp/cpp_enum.h",
+            "src/google/protobuf/compiler/cpp/cpp_enum_field.cc",
+            "src/google/protobuf/compiler/cpp/cpp_enum_field.h",
+            "src/google/protobuf/compiler/cpp/cpp_extension.cc",
+            "src/google/protobuf/compiler/cpp/cpp_extension.h",
+            "src/google/protobuf/compiler/cpp/cpp_field.cc",
+            "src/google/protobuf/compiler/cpp/cpp_field.h",
+            "src/google/protobuf/compiler/cpp/cpp_file.cc",
+            "src/google/protobuf/compiler/cpp/cpp_file.h",
+            "src/google/protobuf/compiler/cpp/cpp_generator.cc",
+            "src/google/protobuf/compiler/cpp/cpp_generator.h",
+            "src/google/protobuf/compiler/cpp/cpp_helpers.cc",
+            "src/google/protobuf/compiler/cpp/cpp_helpers.h",
+            "src/google/protobuf/compiler/cpp/cpp_map_field.cc",
+            "src/google/protobuf/compiler/cpp/cpp_map_field.h",
+            "src/google/protobuf/compiler/cpp/cpp_message.cc",
+            "src/google/protobuf/compiler/cpp/cpp_message.h",
+            "src/google/protobuf/compiler/cpp/cpp_message_field.cc",
+            "src/google/protobuf/compiler/cpp/cpp_message_field.h",
+            "src/google/protobuf/compiler/cpp/cpp_options.h",
+            "src/google/protobuf/compiler/cpp/cpp_primitive_field.cc",
+            "src/google/protobuf/compiler/cpp/cpp_primitive_field.h",
+            "src/google/protobuf/compiler/cpp/cpp_service.cc",
+            "src/google/protobuf/compiler/cpp/cpp_service.h",
+            "src/google/protobuf/compiler/cpp/cpp_string_field.cc",
+            "src/google/protobuf/compiler/cpp/cpp_string_field.h",
+            "src/google/protobuf/compiler/csharp/csharp_doc_comment.cc",
+            "src/google/protobuf/compiler/csharp/csharp_doc_comment.h",
+            "src/google/protobuf/compiler/csharp/csharp_enum.cc",
+            "src/google/protobuf/compiler/csharp/csharp_enum.h",
+            "src/google/protobuf/compiler/csharp/csharp_enum_field.cc",
+            "src/google/protobuf/compiler/csharp/csharp_enum_field.h",
+            "src/google/protobuf/compiler/csharp/csharp_field_base.cc",
+            "src/google/protobuf/compiler/csharp/csharp_field_base.h",
+            "src/google/protobuf/compiler/csharp/csharp_generator.cc",
+            "src/google/protobuf/compiler/csharp/csharp_generator.h",
+            "src/google/protobuf/compiler/csharp/csharp_helpers.cc",
+            "src/google/protobuf/compiler/csharp/csharp_helpers.h",
+            "src/google/protobuf/compiler/csharp/csharp_map_field.cc",
+            "src/google/protobuf/compiler/csharp/csharp_map_field.h",
+            "src/google/protobuf/compiler/csharp/csharp_message.cc",
+            "src/google/protobuf/compiler/csharp/csharp_message.h",
+            "src/google/protobuf/compiler/csharp/csharp_message_field.cc",
+            "src/google/protobuf/compiler/csharp/csharp_message_field.h",
+            "src/google/protobuf/compiler/csharp/csharp_primitive_field.cc",
+            "src/google/protobuf/compiler/csharp/csharp_primitive_field.h",
+            "src/google/protobuf/compiler/csharp/csharp_reflection_class.cc",
+            "src/google/protobuf/compiler/csharp/csharp_reflection_class.h",
+            "src/google/protobuf/compiler/csharp/csharp_repeated_enum_field.cc",
+            "src/google/protobuf/compiler/csharp/csharp_repeated_enum_field.h",
+            "src/google/protobuf/compiler/csharp/csharp_repeated_message_field.cc",
+            "src/google/protobuf/compiler/csharp/csharp_repeated_message_field.h",
+            "src/google/protobuf/compiler/csharp/csharp_repeated_primitive_field.cc",
+            "src/google/protobuf/compiler/csharp/csharp_repeated_primitive_field.h",
+            "src/google/protobuf/compiler/csharp/csharp_source_generator_base.cc",
+            "src/google/protobuf/compiler/csharp/csharp_source_generator_base.h",
+            "src/google/protobuf/compiler/csharp/csharp_wrapper_field.cc",
+            "src/google/protobuf/compiler/csharp/csharp_wrapper_field.h",
+            "src/google/protobuf/compiler/java/java_context.cc",
+            "src/google/protobuf/compiler/java/java_context.h",
+            "src/google/protobuf/compiler/java/java_doc_comment.cc",
+            "src/google/protobuf/compiler/java/java_doc_comment.h",
+            "src/google/protobuf/compiler/java/java_enum.cc",
+            "src/google/protobuf/compiler/java/java_enum.h",
+            "src/google/protobuf/compiler/java/java_enum_field.cc",
+            "src/google/protobuf/compiler/java/java_enum_field.h",
+            "src/google/protobuf/compiler/java/java_enum_field_lite.cc",
+            "src/google/protobuf/compiler/java/java_enum_field_lite.h",
+            "src/google/protobuf/compiler/java/java_enum_lite.cc",
+            "src/google/protobuf/compiler/java/java_enum_lite.h",
+            "src/google/protobuf/compiler/java/java_extension.cc",
+            "src/google/protobuf/compiler/java/java_extension.h",
+            "src/google/protobuf/compiler/java/java_field.cc",
+            "src/google/protobuf/compiler/java/java_field.h",
+            "src/google/protobuf/compiler/java/java_file.cc",
+            "src/google/protobuf/compiler/java/java_file.h",
+            "src/google/protobuf/compiler/java/java_generator.cc",
+            "src/google/protobuf/compiler/java/java_generator.h",
+            "src/google/protobuf/compiler/java/java_generator_factory.cc",
+            "src/google/protobuf/compiler/java/java_generator_factory.h",
+            "src/google/protobuf/compiler/java/java_helpers.cc",
+            "src/google/protobuf/compiler/java/java_helpers.h",
+            "src/google/protobuf/compiler/java/java_lazy_message_field.cc",
+            "src/google/protobuf/compiler/java/java_lazy_message_field.h",
+            "src/google/protobuf/compiler/java/java_lazy_message_field_lite.cc",
+            "src/google/protobuf/compiler/java/java_lazy_message_field_lite.h",
+            "src/google/protobuf/compiler/java/java_map_field.cc",
+            "src/google/protobuf/compiler/java/java_map_field.h",
+            "src/google/protobuf/compiler/java/java_map_field_lite.cc",
+            "src/google/protobuf/compiler/java/java_map_field_lite.h",
+            "src/google/protobuf/compiler/java/java_message.cc",
+            "src/google/protobuf/compiler/java/java_message.h",
+            "src/google/protobuf/compiler/java/java_message_builder.cc",
+            "src/google/protobuf/compiler/java/java_message_builder.h",
+            "src/google/protobuf/compiler/java/java_message_builder_lite.cc",
+            "src/google/protobuf/compiler/java/java_message_builder_lite.h",
+            "src/google/protobuf/compiler/java/java_message_field.cc",
+            "src/google/protobuf/compiler/java/java_message_field.h",
+            "src/google/protobuf/compiler/java/java_message_field_lite.cc",
+            "src/google/protobuf/compiler/java/java_message_field_lite.h",
+            "src/google/protobuf/compiler/java/java_message_lite.cc",
+            "src/google/protobuf/compiler/java/java_message_lite.h",
+            "src/google/protobuf/compiler/java/java_name_resolver.cc",
+            "src/google/protobuf/compiler/java/java_name_resolver.h",
+            "src/google/protobuf/compiler/java/java_primitive_field.cc",
+            "src/google/protobuf/compiler/java/java_primitive_field.h",
+            "src/google/protobuf/compiler/java/java_primitive_field_lite.cc",
+            "src/google/protobuf/compiler/java/java_primitive_field_lite.h",
+            "src/google/protobuf/compiler/java/java_service.cc",
+            "src/google/protobuf/compiler/java/java_service.h",
+            "src/google/protobuf/compiler/java/java_shared_code_generator.cc",
+            "src/google/protobuf/compiler/java/java_shared_code_generator.h",
+            "src/google/protobuf/compiler/java/java_string_field.cc",
+            "src/google/protobuf/compiler/java/java_string_field.h",
+            "src/google/protobuf/compiler/java/java_string_field_lite.cc",
+            "src/google/protobuf/compiler/java/java_string_field_lite.h",
+            "src/google/protobuf/compiler/javanano/javanano_enum.cc",
+            "src/google/protobuf/compiler/javanano/javanano_enum.h",
+            "src/google/protobuf/compiler/javanano/javanano_enum_field.cc",
+            "src/google/protobuf/compiler/javanano/javanano_enum_field.h",
+            "src/google/protobuf/compiler/javanano/javanano_extension.cc",
+            "src/google/protobuf/compiler/javanano/javanano_extension.h",
+            "src/google/protobuf/compiler/javanano/javanano_field.cc",
+            "src/google/protobuf/compiler/javanano/javanano_field.h",
+            "src/google/protobuf/compiler/javanano/javanano_file.cc",
+            "src/google/protobuf/compiler/javanano/javanano_file.h",
+            "src/google/protobuf/compiler/javanano/javanano_generator.cc",
+            "src/google/protobuf/compiler/javanano/javanano_generator.h",
+            "src/google/protobuf/compiler/javanano/javanano_helpers.cc",
+            "src/google/protobuf/compiler/javanano/javanano_helpers.h",
+            "src/google/protobuf/compiler/javanano/javanano_map_field.cc",
+            "src/google/protobuf/compiler/javanano/javanano_map_field.h",
+            "src/google/protobuf/compiler/javanano/javanano_message.cc",
+            "src/google/protobuf/compiler/javanano/javanano_message.h",
+            "src/google/protobuf/compiler/javanano/javanano_message_field.cc",
+            "src/google/protobuf/compiler/javanano/javanano_message_field.h",
+            "src/google/protobuf/compiler/javanano/javanano_primitive_field.cc",
+            "src/google/protobuf/compiler/javanano/javanano_primitive_field.h",
+            "src/google/protobuf/compiler/js/js_generator.cc",
+            "src/google/protobuf/compiler/js/js_generator.h",
+            "src/google/protobuf/compiler/objectivec/objectivec_enum.cc",
+            "src/google/protobuf/compiler/objectivec/objectivec_enum.h",
+            "src/google/protobuf/compiler/objectivec/objectivec_enum_field.cc",
+            "src/google/protobuf/compiler/objectivec/objectivec_enum_field.h",
+            "src/google/protobuf/compiler/objectivec/objectivec_extension.cc",
+            "src/google/protobuf/compiler/objectivec/objectivec_extension.h",
+            "src/google/protobuf/compiler/objectivec/objectivec_field.cc",
+            "src/google/protobuf/compiler/objectivec/objectivec_field.h",
+            "src/google/protobuf/compiler/objectivec/objectivec_file.cc",
+            "src/google/protobuf/compiler/objectivec/objectivec_file.h",
+            "src/google/protobuf/compiler/objectivec/objectivec_generator.cc",
+            "src/google/protobuf/compiler/objectivec/objectivec_generator.h",
+            "src/google/protobuf/compiler/objectivec/objectivec_helpers.cc",
+            "src/google/protobuf/compiler/objectivec/objectivec_helpers.h",
+            "src/google/protobuf/compiler/objectivec/objectivec_map_field.cc",
+            "src/google/protobuf/compiler/objectivec/objectivec_map_field.h",
+            "src/google/protobuf/compiler/objectivec/objectivec_message.cc",
+            "src/google/protobuf/compiler/objectivec/objectivec_message.h",
+            "src/google/protobuf/compiler/objectivec/objectivec_message_field.cc",
+            "src/google/protobuf/compiler/objectivec/objectivec_message_field.h",
+            "src/google/protobuf/compiler/objectivec/objectivec_oneof.cc",
+            "src/google/protobuf/compiler/objectivec/objectivec_oneof.h",
+            "src/google/protobuf/compiler/objectivec/objectivec_primitive_field.cc",
+            "src/google/protobuf/compiler/objectivec/objectivec_primitive_field.h",
+            "src/google/protobuf/compiler/plugin.cc",
+            "src/google/protobuf/compiler/plugin.h",
+            "src/google/protobuf/compiler/plugin.pb.cc",
+            "src/google/protobuf/compiler/plugin.pb.h",
+            "src/google/protobuf/compiler/python/python_generator.cc",
+            "src/google/protobuf/compiler/python/python_generator.h",
+            "src/google/protobuf/compiler/ruby/ruby_generator.cc",
+            "src/google/protobuf/compiler/ruby/ruby_generator.h",
+            "src/google/protobuf/compiler/subprocess.cc",
+            "src/google/protobuf/compiler/subprocess.h",
+            "src/google/protobuf/compiler/zip_writer.cc",
+            "src/google/protobuf/compiler/zip_writer.h",
+          ],
+          'variables': {
+            'clang_warning_flags': [
+              # protobuf-3 contains a few functions that are unused.
+              '-Wno-unused-function',

[Wez, 2016/04/28 22:46:05]

Why are they unused? Do we have a bug filed against protobuf to address that..?

+            ],
+          },
+          'dependencies': [
+            'protobuf_full_do_not_use',
+          ],
+          'include_dirs': [
+            'src',
+          ],
+        },
+        {
           'target_name': 'protoc',
           'conditions': [
             ['OS!="ios" or "<(GENERATOR)"!="xcode" or "<(GENERATOR_FLAVOR)"=="ninja"', {
               'type': 'executable',
               'toolsets': ['host'],
               'sources': [
-                "src/google/protobuf/compiler/code_generator.cc",
-                "src/google/protobuf/compiler/code_generator.h",
-                "src/google/protobuf/compiler/command_line_interface.cc",
-                "src/google/protobuf/compiler/command_line_interface.h",
-                "src/google/protobuf/compiler/cpp/cpp_enum.cc",
-                "src/google/protobuf/compiler/cpp/cpp_enum.h",
-                "src/google/protobuf/compiler/cpp/cpp_enum_field.cc",
-                "src/google/protobuf/compiler/cpp/cpp_enum_field.h",
-                "src/google/protobuf/compiler/cpp/cpp_extension.cc",
-                "src/google/protobuf/compiler/cpp/cpp_extension.h",
-                "src/google/protobuf/compiler/cpp/cpp_field.cc",
-                "src/google/protobuf/compiler/cpp/cpp_field.h",
-                "src/google/protobuf/compiler/cpp/cpp_file.cc",
-                "src/google/protobuf/compiler/cpp/cpp_file.h",
-                "src/google/protobuf/compiler/cpp/cpp_generator.cc",
-                "src/google/protobuf/compiler/cpp/cpp_generator.h",
-                "src/google/protobuf/compiler/cpp/cpp_helpers.cc",
-                "src/google/protobuf/compiler/cpp/cpp_helpers.h",
-                "src/google/protobuf/compiler/cpp/cpp_map_field.cc",
-                "src/google/protobuf/compiler/cpp/cpp_map_field.h",
-                "src/google/protobuf/compiler/cpp/cpp_message.cc",
-                "src/google/protobuf/compiler/cpp/cpp_message.h",
-                "src/google/protobuf/compiler/cpp/cpp_message_field.cc",
-                "src/google/protobuf/compiler/cpp/cpp_message_field.h",
-                "src/google/protobuf/compiler/cpp/cpp_options.h",
-                "src/google/protobuf/compiler/cpp/cpp_primitive_field.cc",
-                "src/google/protobuf/compiler/cpp/cpp_primitive_field.h",
-                "src/google/protobuf/compiler/cpp/cpp_service.cc",
-                "src/google/protobuf/compiler/cpp/cpp_service.h",
-                "src/google/protobuf/compiler/cpp/cpp_string_field.cc",
-                "src/google/protobuf/compiler/cpp/cpp_string_field.h",
-                "src/google/protobuf/compiler/csharp/csharp_doc_comment.cc",
-                "src/google/protobuf/compiler/csharp/csharp_doc_comment.h",
-                "src/google/protobuf/compiler/csharp/csharp_enum.cc",
-                "src/google/protobuf/compiler/csharp/csharp_enum.h",
-                "src/google/protobuf/compiler/csharp/csharp_enum_field.cc",
-                "src/google/protobuf/compiler/csharp/csharp_enum_field.h",
-                "src/google/protobuf/compiler/csharp/csharp_field_base.cc",
-                "src/google/protobuf/compiler/csharp/csharp_field_base.h",
-                "src/google/protobuf/compiler/csharp/csharp_generator.cc",
-                "src/google/protobuf/compiler/csharp/csharp_generator.h",
-                "src/google/protobuf/compiler/csharp/csharp_helpers.cc",
-                "src/google/protobuf/compiler/csharp/csharp_helpers.h",
-                "src/google/protobuf/compiler/csharp/csharp_map_field.cc",
-                "src/google/protobuf/compiler/csharp/csharp_map_field.h",
-                "src/google/protobuf/compiler/csharp/csharp_message.cc",
-                "src/google/protobuf/compiler/csharp/csharp_message.h",
-                "src/google/protobuf/compiler/csharp/csharp_message_field.cc",
-                "src/google/protobuf/compiler/csharp/csharp_message_field.h",
-                "src/google/protobuf/compiler/csharp/csharp_primitive_field.cc",
-                "src/google/protobuf/compiler/csharp/csharp_primitive_field.h",
-                "src/google/protobuf/compiler/csharp/csharp_reflection_class.cc",
-                "src/google/protobuf/compiler/csharp/csharp_reflection_class.h",
-                "src/google/protobuf/compiler/csharp/csharp_repeated_enum_field.cc",
-                "src/google/protobuf/compiler/csharp/csharp_repeated_enum_field.h",
-                "src/google/protobuf/compiler/csharp/csharp_repeated_message_field.cc",
-                "src/google/protobuf/compiler/csharp/csharp_repeated_message_field.h",
-                "src/google/protobuf/compiler/csharp/csharp_repeated_primitive_field.cc",
-                "src/google/protobuf/compiler/csharp/csharp_repeated_primitive_field.h",
-                "src/google/protobuf/compiler/csharp/csharp_source_generator_base.cc",
-                "src/google/protobuf/compiler/csharp/csharp_source_generator_base.h",
-                "src/google/protobuf/compiler/csharp/csharp_wrapper_field.cc",
-                "src/google/protobuf/compiler/csharp/csharp_wrapper_field.h",
-                "src/google/protobuf/compiler/java/java_context.cc",
-                "src/google/protobuf/compiler/java/java_context.h",
-                "src/google/protobuf/compiler/java/java_doc_comment.cc",
-                "src/google/protobuf/compiler/java/java_doc_comment.h",
-                "src/google/protobuf/compiler/java/java_enum.cc",
-                "src/google/protobuf/compiler/java/java_enum.h",
-                "src/google/protobuf/compiler/java/java_enum_field.cc",
-                "src/google/protobuf/compiler/java/java_enum_field.h",
-                "src/google/protobuf/compiler/java/java_enum_field_lite.cc",
-                "src/google/protobuf/compiler/java/java_enum_field_lite.h",
-                "src/google/protobuf/compiler/java/java_enum_lite.cc",
-                "src/google/protobuf/compiler/java/java_enum_lite.h",
-                "src/google/protobuf/compiler/java/java_extension.cc",
-                "src/google/protobuf/compiler/java/java_extension.h",
-                "src/google/protobuf/compiler/java/java_field.cc",
-                "src/google/protobuf/compiler/java/java_field.h",
-                "src/google/protobuf/compiler/java/java_file.cc",
-                "src/google/protobuf/compiler/java/java_file.h",
-                "src/google/protobuf/compiler/java/java_generator.cc",
-                "src/google/protobuf/compiler/java/java_generator.h",
-                "src/google/protobuf/compiler/java/java_generator_factory.cc",
-                "src/google/protobuf/compiler/java/java_generator_factory.h",
-                "src/google/protobuf/compiler/java/java_helpers.cc",
-                "src/google/protobuf/compiler/java/java_helpers.h",
-                "src/google/protobuf/compiler/java/java_lazy_message_field.cc",
-                "src/google/protobuf/compiler/java/java_lazy_message_field.h",
-                "src/google/protobuf/compiler/java/java_lazy_message_field_lite.cc",
-                "src/google/protobuf/compiler/java/java_lazy_message_field_lite.h",
-                "src/google/protobuf/compiler/java/java_map_field.cc",
-                "src/google/protobuf/compiler/java/java_map_field.h",
-                "src/google/protobuf/compiler/java/java_map_field_lite.cc",
-                "src/google/protobuf/compiler/java/java_map_field_lite.h",
-                "src/google/protobuf/compiler/java/java_message.cc",
-                "src/google/protobuf/compiler/java/java_message.h",
-                "src/google/protobuf/compiler/java/java_message_builder.cc",
-                "src/google/protobuf/compiler/java/java_message_builder.h",
-                "src/google/protobuf/compiler/java/java_message_builder_lite.cc",
-                "src/google/protobuf/compiler/java/java_message_builder_lite.h",
-                "src/google/protobuf/compiler/java/java_message_field.cc",
-                "src/google/protobuf/compiler/java/java_message_field.h",
-                "src/google/protobuf/compiler/java/java_message_field_lite.cc",
-                "src/google/protobuf/compiler/java/java_message_field_lite.h",
-                "src/google/protobuf/compiler/java/java_message_lite.cc",
-                "src/google/protobuf/compiler/java/java_message_lite.h",
-                "src/google/protobuf/compiler/java/java_name_resolver.cc",
-                "src/google/protobuf/compiler/java/java_name_resolver.h",
-                "src/google/protobuf/compiler/java/java_primitive_field.cc",
-                "src/google/protobuf/compiler/java/java_primitive_field.h",
-                "src/google/protobuf/compiler/java/java_primitive_field_lite.cc",
-                "src/google/protobuf/compiler/java/java_primitive_field_lite.h",
-                "src/google/protobuf/compiler/java/java_service.cc",
-                "src/google/protobuf/compiler/java/java_service.h",
-                "src/google/protobuf/compiler/java/java_shared_code_generator.cc",
-                "src/google/protobuf/compiler/java/java_shared_code_generator.h",
-                "src/google/protobuf/compiler/java/java_string_field.cc",
-                "src/google/protobuf/compiler/java/java_string_field.h",
-                "src/google/protobuf/compiler/java/java_string_field_lite.cc",
-                "src/google/protobuf/compiler/java/java_string_field_lite.h",
-                "src/google/protobuf/compiler/javanano/javanano_enum.cc",
-                "src/google/protobuf/compiler/javanano/javanano_enum.h",
-                "src/google/protobuf/compiler/javanano/javanano_enum_field.cc",
-                "src/google/protobuf/compiler/javanano/javanano_enum_field.h",
-                "src/google/protobuf/compiler/javanano/javanano_extension.cc",
-                "src/google/protobuf/compiler/javanano/javanano_extension.h",
-                "src/google/protobuf/compiler/javanano/javanano_field.cc",
-                "src/google/protobuf/compiler/javanano/javanano_field.h",
-                "src/google/protobuf/compiler/javanano/javanano_file.cc",
-                "src/google/protobuf/compiler/javanano/javanano_file.h",
-                "src/google/protobuf/compiler/javanano/javanano_generator.cc",
-                "src/google/protobuf/compiler/javanano/javanano_generator.h",
-                "src/google/protobuf/compiler/javanano/javanano_helpers.cc",
-                "src/google/protobuf/compiler/javanano/javanano_helpers.h",
-                "src/google/protobuf/compiler/javanano/javanano_map_field.cc",
-                "src/google/protobuf/compiler/javanano/javanano_map_field.h",
-                "src/google/protobuf/compiler/javanano/javanano_message.cc",
-                "src/google/protobuf/compiler/javanano/javanano_message.h",
-                "src/google/protobuf/compiler/javanano/javanano_message_field.cc",
-                "src/google/protobuf/compiler/javanano/javanano_message_field.h",
-                "src/google/protobuf/compiler/javanano/javanano_primitive_field.cc",
-                "src/google/protobuf/compiler/javanano/javanano_primitive_field.h",
-                "src/google/protobuf/compiler/js/js_generator.cc",
-                "src/google/protobuf/compiler/js/js_generator.h",
                 "src/google/protobuf/compiler/main.cc",
-                "src/google/protobuf/compiler/objectivec/objectivec_enum.cc",
-                "src/google/protobuf/compiler/objectivec/objectivec_enum.h",
-                "src/google/protobuf/compiler/objectivec/objectivec_enum_field.cc",
-                "src/google/protobuf/compiler/objectivec/objectivec_enum_field.h",
-                "src/google/protobuf/compiler/objectivec/objectivec_extension.cc",
-                "src/google/protobuf/compiler/objectivec/objectivec_extension.h",
-                "src/google/protobuf/compiler/objectivec/objectivec_field.cc",
-                "src/google/protobuf/compiler/objectivec/objectivec_field.h",
-                "src/google/protobuf/compiler/objectivec/objectivec_file.cc",
-                "src/google/protobuf/compiler/objectivec/objectivec_file.h",
-                "src/google/protobuf/compiler/objectivec/objectivec_generator.cc",
-                "src/google/protobuf/compiler/objectivec/objectivec_generator.h",
-                "src/google/protobuf/compiler/objectivec/objectivec_helpers.cc",
-                "src/google/protobuf/compiler/objectivec/objectivec_helpers.h",
-                "src/google/protobuf/compiler/objectivec/objectivec_map_field.cc",
-                "src/google/protobuf/compiler/objectivec/objectivec_map_field.h",
-                "src/google/protobuf/compiler/objectivec/objectivec_message.cc",
-                "src/google/protobuf/compiler/objectivec/objectivec_message.h",
-                "src/google/protobuf/compiler/objectivec/objectivec_message_field.cc",
-                "src/google/protobuf/compiler/objectivec/objectivec_message_field.h",
-                "src/google/protobuf/compiler/objectivec/objectivec_oneof.cc",
-                "src/google/protobuf/compiler/objectivec/objectivec_oneof.h",
-                "src/google/protobuf/compiler/objectivec/objectivec_primitive_field.cc",
-                "src/google/protobuf/compiler/objectivec/objectivec_primitive_field.h",
-                "src/google/protobuf/compiler/plugin.cc",
-                "src/google/protobuf/compiler/plugin.h",
-                "src/google/protobuf/compiler/plugin.pb.cc",
-                "src/google/protobuf/compiler/plugin.pb.h",
-                "src/google/protobuf/compiler/python/python_generator.cc",
-                "src/google/protobuf/compiler/python/python_generator.h",
-                "src/google/protobuf/compiler/ruby/ruby_generator.cc",
-                "src/google/protobuf/compiler/ruby/ruby_generator.h",
-                "src/google/protobuf/compiler/subprocess.cc",
-                "src/google/protobuf/compiler/subprocess.h",
-                "src/google/protobuf/compiler/zip_writer.cc",
-                "src/google/protobuf/compiler/zip_writer.h",
               ],
-              'variables': {
-                'clang_warning_flags': [
-                  # protobuf-3 contains a few functions that are unused.
-                  '-Wno-unused-function',
-                ],
-              },
               'dependencies': [
-                'protobuf_full_do_not_use',
+                'protoc_lib',
               ],
               'include_dirs': [
-                'src/src',
+                'src',
               ],
             }, {  # else, OS=="ios" and "<(GENERATOR)"=="xcode" and "<(GENERATOR_FLAVOR)"!="ninja"
               'type': 'none',