summaryrefslogtreecommitdiffstats
path: root/third_party
diff options
context:
space:
mode:
authorsergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-22 01:35:13 +0000
committersergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-22 01:35:13 +0000
commit64a41a99e6eba4a1b2594a156462bf5dfac34566 (patch)
tree1ee943e01b44af23d01720a56da09c41be9cef0e /third_party
parentbb518210a59655710c4a174e8c055000d5547078 (diff)
downloadchromium_src-64a41a99e6eba4a1b2594a156462bf5dfac34566.zip
chromium_src-64a41a99e6eba4a1b2594a156462bf5dfac34566.tar.gz
chromium_src-64a41a99e6eba4a1b2594a156462bf5dfac34566.tar.bz2
Revert 60142 - Add libsrtp in DEPS, gyp file for libsrtp.
BUG=53986 TEST=none Review URL: http://codereview.chromium.org/3382013 TBR=sergeyu@chromium.org Review URL: http://codereview.chromium.org/3381016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@60144 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
-rw-r--r--third_party/libsrtp/README.chromium6
-rw-r--r--third_party/libsrtp/config/config.h6
-rw-r--r--third_party/libsrtp/libsrtp.gyp97
3 files changed, 0 insertions, 109 deletions
diff --git a/third_party/libsrtp/README.chromium b/third_party/libsrtp/README.chromium
deleted file mode 100644
index 25c24c9..0000000
--- a/third_party/libsrtp/README.chromium
+++ /dev/null
@@ -1,6 +0,0 @@
-Name: libsrtp
-URL: http://srtp.sourceforge.net
-License File: src/LICENSE
-
-Chromoting uses libSRTP to encrypt video stream.
-See source/README.chromium for about current revision.
diff --git a/third_party/libsrtp/config/config.h b/third_party/libsrtp/config/config.h
deleted file mode 100644
index 8a4f96f..0000000
--- a/third_party/libsrtp/config/config.h
+++ /dev/null
@@ -1,6 +0,0 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// This is a stub config.h for libSRTP. It doesn't define anything because
-// build is configured by libsrtp.gyp.
diff --git a/third_party/libsrtp/libsrtp.gyp b/third_party/libsrtp/libsrtp.gyp
deleted file mode 100644
index ec2fa1b..0000000
--- a/third_party/libsrtp/libsrtp.gyp
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright (c) 2009 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-{
- 'target_defaults': {
- 'defines': [
- 'HAVE_STDLIB_H',
- 'HAVE_STRING_H',
- ],
- 'include_dirs': [
- './config',
- './src/include',
- './src/crypto/include',
- ],
- 'conditions': [
- ['target_arch=="x64"', {
- 'defines': [
- 'CPU_CISC',
- 'SIZEOF_UNSIGNED_LONG=8',
- 'SIZEOF_UNSIGNED_LONG_LONG=8',
- ],
- }],
- ['target_arch=="ia32"', {
- 'defines': [
- 'CPU_CISC',
- 'SIZEOF_UNSIGNED_LONG=4',
- 'SIZEOF_UNSIGNED_LONG_LONG=8',
- ],
- }],
- ['target_arch=="arm"', {
- 'defines': [
- 'CPU_RISC',
- 'SIZEOF_UNSIGNED_LONG=4',
- 'SIZEOF_UNSIGNED_LONG_LONG=8',
- ],
- }],
- ['OS!="win" and target_arch=="ia32"', {
- 'defines': [
- 'HAVE_X86',
- ],
- }],
- ['OS!="win"', {
- 'defines': [
- 'HAVE_STDINT_H',
- 'HAVE_INTTYPES_H',
- ],
- }],
- ['OS=="win"', {
- 'defines': [
- 'HAVE_WINSOCK2_H',
- 'inline=__inline',
- ],
- }],
- ],
- },
- 'targets': [
- {
- 'target_name': 'libsrtp',
- 'type': '<(library)',
- 'sources': [
- 'src/srtp/ekt.c',
- 'src/srtp/srtp.c',
- 'src/tables/aes_tables.c',
- 'src/crypto/cipher/aes_icm.c',
- 'src/crypto/cipher/null_cipher.c',
- 'src/crypto/cipher/aes_cbc.c',
- 'src/crypto/cipher/cipher.c',
- 'src/crypto/cipher/aes.c',
- 'src/crypto/math/datatypes.c',
- 'src/crypto/math/gf2_8.c',
- 'src/crypto/math/stat.c',
- 'src/crypto/replay/rdbx.c',
- 'src/crypto/replay/ut_sim.c',
- 'src/crypto/replay/rdb.c',
- 'src/crypto/kernel/alloc.c',
- 'src/crypto/kernel/key.c',
- 'src/crypto/kernel/err.c',
- 'src/crypto/kernel/crypto_kernel.c',
- 'src/crypto/rng/rand_source.c',
- 'src/crypto/rng/prng.c',
- 'src/crypto/rng/ctr_prng.c',
- 'src/crypto/ae_xfm/xfm.c',
- 'src/crypto/hash/sha1.c',
- 'src/crypto/hash/hmac.c',
- 'src/crypto/hash/null_auth.c',
- 'src/crypto/hash/auth.c',
- ],
- },
- ],
-}
-
-# Local Variables:
-# tab-width:2
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=2 shiftwidth=2: