| Index: talk/build/common.gypi
|
| diff --git a/talk/build/common.gypi b/talk/build/common.gypi
|
| index 6da1449da243fc3f0cbec381f5285ae8d4d9ef98..4ee78f1c472cc8438b963e0d27dcfe73cf7a5daa 100644
|
| --- a/talk/build/common.gypi
|
| +++ b/talk/build/common.gypi
|
| @@ -34,14 +34,7 @@
|
| # flood of chromium-style warnings.
|
| 'clang_use_chrome_plugins%': 0,
|
| # Disable these to not build components which can be externally provided.
|
| - 'build_expat%': 1,
|
| 'build_json%': 1,
|
| - 'build_libsrtp%': 1,
|
| - # Make it possible to provide custom locations for some libraries.
|
| - 'libyuv_dir%': '<(DEPTH)/third_party/libyuv',
|
| -
|
| - # Disable this to skip building source requiring GTK.
|
| - 'use_gtk%': 1,
|
| },
|
| 'target_defaults': {
|
| 'include_dirs': [
|
| @@ -51,13 +44,6 @@
|
| '../../third_party/webrtc',
|
| '../../webrtc',
|
| ],
|
| - 'defines': [
|
| - 'SRTP_RELATIVE_PATH',
|
| -
|
| - # Feature selection
|
| - 'HAVE_SCTP',
|
| - 'HAVE_SRTP',
|
| - ],
|
| 'conditions': [
|
| ['OS=="linux"', {
|
| 'defines': [
|
|
|