summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--DEPS3
-rw-r--r--remoting/remoting.gyp1
-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
5 files changed, 0 insertions, 113 deletions
diff --git a/DEPS b/DEPS
index 76f5ed2..00459e4 100644
--- a/DEPS
+++ b/DEPS
@@ -175,9 +175,6 @@ deps = {
"src/third_party/speex":
"/trunk/deps/third_party/speex@56515",
-
- "src/third_party/libsrtp/src":
- "/trunk/deps/third_party/libsrtp@60080",
}
diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp
index 486526e..b0c52e2 100644
--- a/remoting/remoting.gyp
+++ b/remoting/remoting.gyp
@@ -298,7 +298,6 @@
'../jingle/jingle.gyp:notifier',
'../third_party/libjingle/libjingle.gyp:libjingle',
'../third_party/libjingle/libjingle.gyp:libjingle_p2p',
- '../third_party/libsrtp/libsrtp.gyp:libsrtp',
],
'export_dependent_settings': [
'../third_party/libjingle/libjingle.gyp:libjingle',
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: