summaryrefslogtreecommitdiffstats
path: root/third_party/protobuf
diff options
context:
space:
mode:
authorevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-03 00:48:45 +0000
committerevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-03 00:48:45 +0000
commita8e3d8d3806ad8d1349f7a9d7cc3c585525bc4b4 (patch)
tree568bb63a053c234b9c74e550779678057c83fa3c /third_party/protobuf
parentd68290e7c4f695a690dce61595cb9031e2ee98a0 (diff)
downloadchromium_src-a8e3d8d3806ad8d1349f7a9d7cc3c585525bc4b4.zip
chromium_src-a8e3d8d3806ad8d1349f7a9d7cc3c585525bc4b4.tar.gz
chromium_src-a8e3d8d3806ad8d1349f7a9d7cc3c585525bc4b4.tar.bz2
don't link unknown_field_set into both protobuf_lite and protobuf_full
This source file was moved from protobuf_full to protobuf_lite in r62331, but accidentally left in both libraries. Review URL: http://codereview.chromium.org/6913006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@83823 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/protobuf')
-rw-r--r--third_party/protobuf/protobuf.gyp2
1 files changed, 0 insertions, 2 deletions
diff --git a/third_party/protobuf/protobuf.gyp b/third_party/protobuf/protobuf.gyp
index d9fe73c..c104f2d 100644
--- a/third_party/protobuf/protobuf.gyp
+++ b/third_party/protobuf/protobuf.gyp
@@ -109,7 +109,6 @@
'src/google/protobuf/reflection_ops.h',
'src/google/protobuf/service.h',
'src/google/protobuf/text_format.h',
- 'src/google/protobuf/unknown_field_set.h',
'src/google/protobuf/wire_format.h',
'src/google/protobuf/io/gzip_stream.h',
'src/google/protobuf/io/printer.h',
@@ -135,7 +134,6 @@
'src/google/protobuf/reflection_ops.cc',
'src/google/protobuf/service.cc',
'src/google/protobuf/text_format.cc',
- 'src/google/protobuf/unknown_field_set.cc',
'src/google/protobuf/wire_format.cc',
# This file pulls in zlib, but it's not actually used by protoc, so
# instead of compiling zlib for the host, let's just exclude this.