diff options
| author | piman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-02 20:32:51 +0000 |
|---|---|---|
| committer | piman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-02 20:32:51 +0000 |
| commit | 4907ac4a4a21e30f8e8931700f066be7a77268bd (patch) | |
| tree | f1fbe759d0b48388561dd48f1509cbfabe21f318 /third_party | |
| parent | 6c0dabc62c20fecb61d6de75fed7b40b16214a2c (diff) | |
| download | chromium_src-4907ac4a4a21e30f8e8931700f066be7a77268bd.zip chromium_src-4907ac4a4a21e30f8e8931700f066be7a77268bd.tar.gz chromium_src-4907ac4a4a21e30f8e8931700f066be7a77268bd.tar.bz2 | |
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
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/libjingle/libjingle.gyp | 1 | ||||
| -rw-r--r-- | third_party/protobuf2/protobuf.gyp | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/third_party/libjingle/libjingle.gyp b/third_party/libjingle/libjingle.gyp index b360568..b600e75 100644 --- a/third_party/libjingle/libjingle.gyp +++ b/third_party/libjingle/libjingle.gyp @@ -67,6 +67,7 @@ 'files/talk/base/asyncpacketsocket.cc', 'files/talk/base/asyncpacketsocket.h', 'files/talk/base/asynctcpsocket.h', + 'files/talk/base/asynctcpsocket.cc', 'files/talk/base/asyncudpsocket.cc', 'files/talk/base/asyncudpsocket.h', 'files/talk/base/autodetectproxy.cc', 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', ], |