From 3a713e67a681bde145267d3d12a09d867c1945a9 Mon Sep 17 00:00:00 2001 From: "mallinath@google.com" Date: Fri, 27 Jan 2012 04:46:57 +0000 Subject: Rolling libsrtp in Chrome Enabling srtp in libjingle. Removing config.h as it's not used. Review URL: http://codereview.chromium.org/9234029 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@119364 0039d316-1c4b-4281-b951-d872f2087c98 --- DEPS | 4 + third_party/libjingle/libjingle.gyp | 3 + third_party/libjingle/overrides/config.h | 121 ------------------------------- 3 files changed, 7 insertions(+), 121 deletions(-) delete mode 100644 third_party/libjingle/overrides/config.h diff --git a/DEPS b/DEPS index 1f78b53..9b9ab5b 100644 --- a/DEPS +++ b/DEPS @@ -253,6 +253,10 @@ deps = { (Var("googlecode_url") % "libjingle") + "/trunk@" + Var("libjingle_revision"), + "src/third_party/libsrtp": + "/trunk/deps/third_party/libsrtp@119285", + + "src/third_party/speex": "/trunk/deps/third_party/speex@111570", diff --git a/third_party/libjingle/libjingle.gyp b/third_party/libjingle/libjingle.gyp index 7a5b50e..d9e6a0f 100644 --- a/third_party/libjingle/libjingle.gyp +++ b/third_party/libjingle/libjingle.gyp @@ -18,6 +18,8 @@ 'HAVE_WEBRTC_VIDEO', 'HAVE_WEBRTC_VOICE', 'NO_SOUND_SYSTEM', + 'HAVE_SRTP', + 'SRTP_RELATIVE_PATH', ], 'configurations': { 'Debug': { @@ -553,6 +555,7 @@ ['OS!="android"', { 'dependencies': [ # We won't build with WebRTC on Android. + '<(DEPTH)/third_party/libsrtp/libsrtp.gyp:libsrtp', '<(DEPTH)/third_party/webrtc/modules/modules.gyp:video_capture_module', '<(DEPTH)/third_party/webrtc/modules/modules.gyp:video_render_module', '<(DEPTH)/third_party/webrtc/video_engine/video_engine.gyp:video_engine_core', diff --git a/third_party/libjingle/overrides/config.h b/third_party/libjingle/overrides/config.h deleted file mode 100644 index 872d609..0000000 --- a/third_party/libjingle/overrides/config.h +++ /dev/null @@ -1,121 +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 file provides a include for compiling libjingle. -// This file was generated using libjingle's autoconf utility. -// It fixes compilation in linux. - -/* Chat archiving */ -//#define FEATURE_ENABLE_CHAT_ARCHIVING 1 - -/* Enable SSL */ -//#define FEATURE_ENABLE_SSL 1 - -/* voice mail */ -//#define FEATURE_ENABLE_VOICEMAIL 1 - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_ALSA_ASOUNDLIB_H */ - -/* Define to 1 if you have the header file. */ -#define HAVE_DLFCN_H 1 - -/* Have GIPS Voice Engine */ -#define HAVE_GIPS 1 - -/* Glib is required for oRTP code */ -/* #undef HAVE_GLIB */ - -/* Defined when we have ilbc codec lib */ -/* #undef HAVE_ILBC */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_ILBC_DECODE_H */ - -/* Define to 1 if you have the header file. */ -#define HAVE_INTTYPES_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_MEMORY_H 1 - -/* Define if you have the header file. */ -#define HAVE_OPENSSL_SSL_H 1 - -/* Define if you have semtimedop() for SysV semaphares. */ -#define HAVE_SEMTIMEDOP 1 - -/* has speex */ -/* #undef HAVE_SPEEX */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_SPEEX_H */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_SPEEX_SPEEX_H */ - -/* Define to 1 if you have the header file. */ -#define HAVE_STDINT_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STDLIB_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STRINGS_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STRING_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_STAT_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_TYPES_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_UNISTD_H 1 - -/* Building on Linux */ -#define LINUX 1 - -/* Logging */ -#define LOGGING 1 - -/* Building on OSX */ -/* #undef OSX */ - -/* Name of package */ -// #define PACKAGE "dist-zip" - -/* Define to the address where bug reports for this package should be sent. */ -// #define PACKAGE_BUGREPORT "google-talk-open@googlegroups.com" - -/* Define to the full name of this package. */ -// #define PACKAGE_NAME "libjingle" - -/* Define to the full name and version of this package. */ -// #define PACKAGE_STRING "libjingle 0.3.0" - -/* Define to the one symbol short name of this package. */ -// #define PACKAGE_TARNAME "libjingle" - -/* Define to the version of this package. */ -// #define PACKAGE_VERSION "0.3.0" - -/* If we're using configure, we're on POSIX */ -// #define POSIX 1 - -/* Build as a production build */ -//#define PRODUCTION 1 - -/* Build as a production build */ -//#define PRODUCTION_BUILD 1 - -/* Define to 1 if you have the ANSI C header files. */ -#define STDC_HEADERS 1 - -/* Version number of package */ -// #define VERSION "" - -/* Defined when alsa support is enabled */ -/* #undef __ALSA_ENABLED__ */ -- cgit v1.1