Componentize protobuf_lite

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 f9a624fb7e23959dcab6b6ea9fabeb33bcf4eed5..4ccca6115bd84ff5d25dca8ef918e61d0bf598b3 100644
--- a/third_party/protobuf/protobuf.gyp
+++ b/third_party/protobuf/protobuf.gyp
@@ -1,4 +1,4 @@
-# Copyright (c) 2012 The Chromium Authors. All rights reserved.
+# Copyright 2013 The Chromium Authors. All rights reserved.

[Dirk Pranke, 2013/01/31 02:15:06]

Nit: I think you're supposed to leave the copyright year alone these days?

[Raghu Simha, 2013/01/31 03:14:40]

You're right. Restored.

 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
@@ -129,74 +129,23 @@
         # to your .proto file.
         {
           'target_name': 'protobuf_lite',
-          'type': 'static_library',
+          'type': '<(component)',
           'toolsets': ['host', 'target'],
-          'sources': [
-            'src/google/protobuf/stubs/atomicops.h',
-            'src/google/protobuf/stubs/atomicops_internals_arm_gcc.h',
-            'src/google/protobuf/stubs/atomicops_internals_atomicword_compat.h',
-            'src/google/protobuf/stubs/atomicops_internals_macosx.h',
-            'src/google/protobuf/stubs/atomicops_internals_mips_gcc.h',
-            'src/google/protobuf/stubs/atomicops_internals_x86_gcc.cc',
-            'src/google/protobuf/stubs/atomicops_internals_x86_gcc.h',
-            'src/google/protobuf/stubs/atomicops_internals_x86_msvc.cc',
-            'src/google/protobuf/stubs/atomicops_internals_x86_msvc.h',
-            'src/google/protobuf/stubs/common.h',
-            'src/google/protobuf/stubs/once.h',
-            'src/google/protobuf/stubs/platform_macros.h',
-            'src/google/protobuf/extension_set.h',
-            'src/google/protobuf/generated_message_util.h',
-            'src/google/protobuf/message_lite.h',
-            'src/google/protobuf/repeated_field.h',
-            'src/google/protobuf/unknown_field_set.cc',
-            'src/google/protobuf/unknown_field_set.h',
-            'src/google/protobuf/wire_format_lite.h',
-            'src/google/protobuf/wire_format_lite_inl.h',
-            'src/google/protobuf/io/coded_stream.h',
-            'src/google/protobuf/io/zero_copy_stream.h',
-            'src/google/protobuf/io/zero_copy_stream_impl_lite.h',
-
-            'src/google/protobuf/stubs/common.cc',
-            'src/google/protobuf/stubs/once.cc',
-            'src/google/protobuf/stubs/hash.h',
-            'src/google/protobuf/stubs/map-util.h',
-            'src/google/protobuf/stubs/stl_util-inl.h',
-            'src/google/protobuf/extension_set.cc',
-            'src/google/protobuf/generated_message_util.cc',
-            'src/google/protobuf/message_lite.cc',
-            'src/google/protobuf/repeated_field.cc',
-            'src/google/protobuf/wire_format_lite.cc',
-            'src/google/protobuf/io/coded_stream.cc',
-            'src/google/protobuf/io/coded_stream_inl.h',
-            'src/google/protobuf/io/zero_copy_stream.cc',
-            'src/google/protobuf/io/zero_copy_stream_impl_lite.cc',
-            '<(config_h_dir)/config.h',
+          'includes': [
+            'protobuf_lite.gypi',
           ],
-          'include_dirs': [
-            '<(config_h_dir)',
-            'src',
-          ],
-          # This macro must be defined to suppress the use of dynamic_cast<>,
-          # which requires RTTI.
+          # Required for component builds. See http://crbug.com/172800.
           'defines': [
-            'GOOGLE_PROTOBUF_NO_RTTI',
-            'GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER',
+            'LIBPROTOBUF_EXPORTS',
+            'PROTOBUF_USE_DLLS',

[Dirk Pranke, 2013/01/31 02:15:06]

See my comment in common.h

[Raghu Simha, 2013/01/31 03:14:40]

Likewise :)

           ],
-
           'direct_dependent_settings': {
-            'include_dirs': [
-              '<(config_h_dir)',
-              'src',
-            ],
             'defines': [
-              'GOOGLE_PROTOBUF_NO_RTTI',
-              'GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER',
+              'PROTOBUF_USE_DLLS',
             ],
-            # TODO(jschuh): http://crbug.com/167187 size_t -> int.
-            'msvs_disabled_warnings': [ 4267 ],
           },
         },
-        # This is the full, heavy protobuf lib that's needed for c++ .proto's
+        # This is the full, heavy protobuf lib that's needed for c++ .protos
         # that don't specify the LITE_RUNTIME option.  The protocol
         # compiler itself (protoc) falls into that category.
         #
@@ -205,6 +154,9 @@
           'target_name': 'protobuf_full_do_not_use',
           'type': 'static_library',
           'toolsets': ['host','target'],
+          'includes': [
+            'protobuf_lite.gypi',
+          ],
           'sources': [
             'src/google/protobuf/descriptor.h',
             'src/google/protobuf/descriptor.pb.h',
@@ -250,12 +202,6 @@
             'src/google/protobuf/compiler/importer.cc',
             'src/google/protobuf/compiler/parser.cc',
           ],
-          'dependencies': [
-            'protobuf_lite',
-          ],
-          'export_dependent_settings': [
-            'protobuf_lite',
-          ],
         },
         {
           'target_name': 'protoc',