diff options
| author | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-10 22:19:49 +0000 |
|---|---|---|
| committer | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-10 22:19:49 +0000 |
| commit | 79128ad5039f5e88c75fe89867c4401bb0a3ed4c (patch) | |
| tree | 1ee8495bd25760f5e9cd471594dc413190351b33 /net/net.gyp | |
| parent | 29b31647b5a1cb744c31d9fa53615ce495661849 (diff) | |
| download | chromium_src-79128ad5039f5e88c75fe89867c4401bb0a3ed4c.zip chromium_src-79128ad5039f5e88c75fe89867c4401bb0a3ed4c.tar.gz chromium_src-79128ad5039f5e88c75fe89867c4401bb0a3ed4c.tar.bz2 | |
Revert "net: add Snap Start tests"
This reverts commit r65714. It broke the Linux shared library builders:
SOLINK(target) out/Debug/obj.target/net/libnet_base.so
/usr/bin/ld: error: out/Debug/obj.target/openssl/third_party/openssl/openssl/crypto/sha/sha512t.o: multiple definition of 'main'
/usr/bin/ld: out/Debug/obj.target/openssl/third_party/openssl/openssl/crypto/sha/sha256t.o: previous definition here
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65715 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/net.gyp')
| -rw-r--r-- | net/net.gyp | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/net/net.gyp b/net/net.gyp index 2d2aa50..083aac4b 100644 --- a/net/net.gyp +++ b/net/net.gyp @@ -1381,36 +1381,6 @@ # }, # ] # }], - ['OS=="linux"', { - 'targets': [ - { - 'target_name': 'snap_start_unittests', - 'type': 'executable', - 'dependencies': [ - 'net', - 'net_test_support', - 'openssl_helper', - '../build/linux/system.gyp:nss', - '../testing/gmock.gyp:gmock', - '../testing/gtest.gyp:gtest', - ], - 'sources': [ - 'base/run_all_unittests.cc', - 'socket/ssl_client_socket_snapstart_unittest.cc', - ] - }, - { - 'target_name': 'openssl_helper', - 'type': 'executable', - 'dependencies': [ - '../third_party/openssl/openssl.gyp:openssl', - ], - 'sources': [ - 'test/openssl_helper.cc', - ], - }, - ], - }], ['OS=="win"', { 'targets': [ { |