Linux: add an option to build with system protobuf.

Linux: add an option to build with system protobuf.

This doesn't work yet without upstream protobuf changes,
but with this infrastructure in place it's going to be
easier to test further updates.

Google Chrome will of course use the bundled version,
there's no change here.

BUG=157155
TEST=none

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=165257

[agl, 2012-10-22 16:16:17]

We need unknown field retention, which upstream aren't going to accept. So
building with the system protobuf library will never work.

[Paweł Hajdan Jr., 2012-10-22 22:55:59]

PTAL assuming https://codereview.chromium.org/11228038/ gets landed.

[agl, 2012-10-23 13:58:44]

LGTM

https://codereview.chromium.org/11231046/diff/1/third_party/protobuf/protobuf...
File third_party/protobuf/protobuf.gyp (right):

https://codereview.chromium.org/11231046/diff/1/third_party/protobuf/protobuf...
third_party/protobuf/protobuf.gyp:375: # This macro must be defined to suppress
the use of dynamic_cast<>,
This comment looks like it needs rewrapping, as do a couple above after the
indentation change.

[Paweł Hajdan Jr., 2012-10-29 21:17:50]

I wasn't sure how to rewrap the rest (really commented code instead of a text
comment). Do you know what's the proper way ro do that?

Can I land this? I think I'll find the best way to use system protobuf, but if
this change sits for longer it may rot. It should be safe to land.

[Paweł Hajdan Jr., 2012-10-31 18:02:35]

ping

[agl, 2012-10-31 18:09:12]

lgtm

[commit-bot: I haz the power, 2012-10-31 22:35:24]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/phajdan.jr@chromium.org/11231046/7004

[commit-bot: I haz the power, 2012-10-31 22:35:26]

Failed to apply patch for third_party/protobuf/protobuf.gyp:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file third_party/protobuf/protobuf.gyp
  Hunk #1 FAILED at 4.
  1 out of 1 hunk FAILED -- saving rejects to file
third_party/protobuf/protobuf.gyp.rej

Patch:       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
6b060f2d5c6efad576562b588fbc8b5e2580159d..32f17cc79641add230b8ada23fcc943b95a692a9
100644
--- a/third_party/protobuf/protobuf.gyp
+++ b/third_party/protobuf/protobuf.gyp
@@ -4,357 +4,397 @@
 
 {
   'conditions': [
-    ['OS!="win"', {
-      'variables': {
-        'config_h_dir':
-          '.',  # crafted for gcc/linux.
-      },
-    }, {  # else, OS=="win"
-      'variables': {
-        'config_h_dir':
-          'vsprojects',  # crafted for msvc.
-      },
-      'target_defaults': {
-        'msvs_disabled_warnings': [
-          4018,  # signed/unsigned mismatch in comparison
-          4244,  # implicit conversion, possible loss of data
-          4355,  # 'this' used in base member initializer list
-        ],
-        'defines!': [
-          'WIN32_LEAN_AND_MEAN',  # Protobuf defines this itself.
-        ],
-      },
-    }]
-  ],
-  'targets': [
-    # The "lite" lib is about 1/7th the size of the heavy lib,
-    # but it doesn't support some of the more exotic features of
-    # protobufs, like reflection.  To generate C++ code that can link
-    # against the lite version of the library, add the option line:
-    #
-    #   option optimize_for = LITE_RUNTIME;
-    #
-    # to your .proto file.
-    {
-      'target_name': 'protobuf_lite',
-      'type': 'static_library',
-      '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',
-      ],
-      'include_dirs': [
-        '<(config_h_dir)',
-        'src',
-      ],
-      # This macro must be defined to suppress the use of dynamic_cast<>,
-      # which requires RTTI.
-      'defines': [
-        'GOOGLE_PROTOBUF_NO_RTTI',
-        'GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER',
+    ['use_system_protobuf==0', {
+      'conditions': [
+        ['OS!="win"', {
+          'variables': {
+            'config_h_dir':
+              '.',  # crafted for gcc/linux.
+          },
+        }, {  # else, OS=="win"
+          'variables': {
+            'config_h_dir':
+              'vsprojects',  # crafted for msvc.
+          },
+          'target_defaults': {
+            'msvs_disabled_warnings': [
+              4018,  # signed/unsigned mismatch in comparison
+              4244,  # implicit conversion, possible loss of data
+              4355,  # 'this' used in base member initializer list
+            ],
+            'defines!': [
+              'WIN32_LEAN_AND_MEAN',  # Protobuf defines this itself.
+            ],
+          },
+        }]
       ],
+      'targets': [
+        # The "lite" lib is about 1/7th the size of the heavy lib,
+        # but it doesn't support some of the more exotic features of
+        # protobufs, like reflection.  To generate C++ code that can link
+        # against the lite version of the library, add the option line:
+        #
+        #   option optimize_for = LITE_RUNTIME;
+        #
+        # to your .proto file.
+        {
+          'target_name': 'protobuf_lite',
+          'type': 'static_library',
+          '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',
 
-      'direct_dependent_settings': {
-        'include_dirs': [
-          '<(config_h_dir)',
-          'src',
-        ],
-        'defines': [
-          'GOOGLE_PROTOBUF_NO_RTTI',
-          'GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER',
-        ],
-      },
-    },
-    # This is the full, heavy protobuf lib that's needed for c++ .proto's
-    # that don't specify the LITE_RUNTIME option.  The protocol
-    # compiler itself (protoc) falls into that category.
-    #
-    # DO NOT LINK AGAINST THIS TARGET IN CHROME CODE  --agl
-    {
-      'target_name': 'protobuf_full_do_not_use',
-      'type': 'static_library',
-      'toolsets': ['host','target'],
-      'sources': [
-        'src/google/protobuf/descriptor.h',
-        'src/google/protobuf/descriptor.pb.h',
-        'src/google/protobuf/descriptor_database.h',
-        'src/google/protobuf/dynamic_message.h',
-        'src/google/protobuf/generated_message_reflection.h',
-        'src/google/protobuf/message.h',
-        'src/google/protobuf/reflection_ops.h',
-        'src/google/protobuf/service.h',
-        'src/google/protobuf/text_format.h',
-        'src/google/protobuf/wire_format.h',
-        'src/google/protobuf/io/gzip_stream.h',
-        'src/google/protobuf/io/printer.h',
-        'src/google/protobuf/io/tokenizer.h',
-        'src/google/protobuf/io/zero_copy_stream_impl.h',
-        'src/google/protobuf/compiler/code_generator.h',
-        'src/google/protobuf/compiler/command_line_interface.h',
-        'src/google/protobuf/compiler/importer.h',
-        'src/google/protobuf/compiler/parser.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',
+          ],
+          'include_dirs': [
+            '<(config_h_dir)',
+            'src',
+          ],
+          # This macro must be defined to suppress the use of dynamic_cast<>,
+          # which requires RTTI.
+          'defines': [
+            'GOOGLE_PROTOBUF_NO_RTTI',
+            'GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER',
+          ],
 
-        'src/google/protobuf/stubs/strutil.cc',
-        'src/google/protobuf/stubs/strutil.h',
-        'src/google/protobuf/stubs/substitute.cc',
-        'src/google/protobuf/stubs/substitut…
(message too large)