[sync] Componentize sync: Part 4: Fix includes in third_party/protobuf

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 b679cad20475cf147559e854bc43274aebfd91ce..1fdbf46357bb4622b3fc364996f83c3bbfaf9161 100644
--- a/third_party/protobuf/protobuf.gyp
+++ b/third_party/protobuf/protobuf.gyp
@@ -181,7 +181,19 @@
             'GOOGLE_PROTOBUF_NO_RTTI',
             'GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER',
           ],
-
+          # On Win component builds, we must dynamically link protobuf_lite to
+          # avoid warning C4275: "non dll-interface class used as base for
+          # dll-interface class". See the "DLLs vs. static linking" section in
+          # third_party/protobuf/vsprojects/readme.txt.

[Dirk Pranke, 2012/12/14 21:00:24]

If your intent is for protobuf_lite to be a DLL, you need to change the 'type'
declaration on line 131 above to '<(component)'.

We should probably discuss this change a bit more off-CL so I can be sure I
understand what you're trying to do and what the right way to do it is.

[Raghu Simha, 2012/12/14 22:10:41]

Thanks for your pointers. It turns out that these exports were causing the
multiple definition linker errors. We are (at the moment) not building
protobuf_lite as a dll, and therefore, we should not be exporting symbols within
protobuf_lite. I have undone the exports in this file.

+          'conditions': [
+           ['OS=="win" and component=="shared_library"', {
+             'defines': [
+               'LIBPROTOBUF_EXPORTS',
+               'LIBPROTOC_EXPORTS',
+               'PROTOBUF_USE_DLLS',
+             ],
+           }],
+          ],
           'direct_dependent_settings': {
             'include_dirs': [
               '<(config_h_dir)',
@@ -191,6 +203,15 @@
               'GOOGLE_PROTOBUF_NO_RTTI',
               'GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER',
             ],
+            'conditions': [
+             ['OS=="win" and component=="shared_library"', {
+               'defines': [
+                 'LIBPROTOBUF_EXPORTS',
+                 'LIBPROTOC_EXPORTS',
+                 'PROTOBUF_USE_DLLS',
+               ],
+             }],
+            ],
           },
         },
         # This is the full, heavy protobuf lib that's needed for c++ .proto's