Source release v2.1.3-2-789 + third_party libs

Change-Id: I8648756dab3fe1f53d6da18b83cd1294581d1abe
2014-06-19 17:13:42 -07:00
parent 73445a920c
commit 84acd5a15e
32 changed files with 1340 additions and 1335 deletions
--- a/third_party/protobuf.gyp
+++ b/third_party/protobuf.gyp
@@ -52,6 +52,7 @@
      'target_name': 'protobuf',
      'type': 'static_library',
      'toolsets': ['host'],
+      'includes': ['xcode_host.gypi'],  # xcode workaround
      'sources': [
        '<@(protobuf_lite_sources)',

@@ -89,6 +90,7 @@
      'target_name': 'protoc',
      'type': 'executable',
      'toolsets': ['host'],
+      'includes': ['xcode_host.gypi'],  # xcode workaround
      'sources': [
        '<(protobuf_source_dir)/src/google/protobuf/compiler/code_generator.cc',
        '<(protobuf_source_dir)/src/google/protobuf/compiler/command_line_interface.cc',