From 4907ac4a4a21e30f8e8931700f066be7a77268bd Mon Sep 17 00:00:00 2001 From: "piman@chromium.org" Date: Mon, 2 Nov 2009 20:32:51 +0000 Subject: linux: fix library=shared_library issues Review URL: http://codereview.chromium.org/339079 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30738 0039d316-1c4b-4281-b951-d872f2087c98 --- third_party/protobuf2/protobuf.gyp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'third_party/protobuf2') diff --git a/third_party/protobuf2/protobuf.gyp b/third_party/protobuf2/protobuf.gyp index 7b6d0db..d96d131 100644 --- a/third_party/protobuf2/protobuf.gyp +++ b/third_party/protobuf2/protobuf.gyp @@ -133,11 +133,12 @@ '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/io/gzip_stream.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. + # '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_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', ], -- cgit v1.1