summaryrefslogtreecommitdiffstats
path: root/third_party
diff options
context:
space:
mode:
authorcmasone@google.com <cmasone@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-16 20:51:19 +0000
committercmasone@google.com <cmasone@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-16 20:51:19 +0000
commit79fb4e66af8f7f49a1193bd45746d4c637c45463 (patch)
tree1e7c7143cb93196416a4607351d0a626e7562f57 /third_party
parent85317c707d9ae7fcc73ef05814495bc92123e144 (diff)
downloadchromium_src-79fb4e66af8f7f49a1193bd45746d4c637c45463.zip
chromium_src-79fb4e66af8f7f49a1193bd45746d4c637c45463.tar.gz
chromium_src-79fb4e66af8f7f49a1193bd45746d4c637c45463.tar.bz2
Pull new version of protobuffers that's compatible with no-rtti in debug mode
lands r165517 Review URL: http://codereview.chromium.org/172034 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23535 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
-rw-r--r--third_party/protobuf2/protobuf.gyp6
1 files changed, 4 insertions, 2 deletions
diff --git a/third_party/protobuf2/protobuf.gyp b/third_party/protobuf2/protobuf.gyp
index 43c926b..0800cb1 100644
--- a/third_party/protobuf2/protobuf.gyp
+++ b/third_party/protobuf2/protobuf.gyp
@@ -41,9 +41,7 @@
'src/src/google/protobuf/stubs/once.cc',
'src/src/google/protobuf/stubs/hash.cc',
'src/src/google/protobuf/stubs/hash.h',
- 'src/src/google/protobuf/stubs/map-util.cc',
'src/src/google/protobuf/stubs/map-util.h',
- 'src/src/google/protobuf/stubs/stl_util-inl.cc',
'src/src/google/protobuf/stubs/stl_util-inl.h',
'src/src/google/protobuf/stubs/substitute.cc',
'src/src/google/protobuf/stubs/substitute.h',
@@ -55,20 +53,24 @@
'src/src/google/protobuf/descriptor_database.cc',
'src/src/google/protobuf/dynamic_message.cc',
'src/src/google/protobuf/extension_set.cc',
+ 'src/src/google/protobuf/extension_set_heavy.cc',
'src/src/google/protobuf/generated_message_reflection.cc',
'src/src/google/protobuf/message.cc',
+ 'src/src/google/protobuf/message_lite.cc',
'src/src/google/protobuf/reflection_ops.cc',
'src/src/google/protobuf/repeated_field.cc',
'src/src/google/protobuf/service.cc',
'src/src/google/protobuf/text_format.cc',
'src/src/google/protobuf/unknown_field_set.cc',
'src/src/google/protobuf/wire_format.cc',
+ 'src/src/google/protobuf/wire_format_lite.cc',
'src/src/google/protobuf/io/coded_stream.cc',
'src/src/google/protobuf/io/gzip_stream.cc',
'src/src/google/protobuf/io/printer.cc',
'src/src/google/protobuf/io/tokenizer.cc',
'src/src/google/protobuf/io/zero_copy_stream.cc',
'src/src/google/protobuf/io/zero_copy_stream_impl.cc',
+ 'src/src/google/protobuf/io/zero_copy_stream_impl_lite.cc',
'src/src/google/protobuf/compiler/importer.cc',
'src/src/google/protobuf/compiler/parser.cc',
],