| Index: third_party/libjingle/libjingle.gyp
|
| diff --git a/third_party/libjingle/libjingle.gyp b/third_party/libjingle/libjingle.gyp
|
| index f140c9e7a558ecaa24af20c4e86be04b413fe376..4c2ae7ffce79c9889c5770f6c06f7204992031b7 100644
|
| --- a/third_party/libjingle/libjingle.gyp
|
| +++ b/third_party/libjingle/libjingle.gyp
|
| @@ -8,18 +8,18 @@
|
| ],
|
| 'target_defaults': {
|
| 'defines': [
|
| - 'FEATURE_ENABLE_SSL',
|
| - 'FEATURE_ENABLE_VOICEMAIL', # TODO(ncarter): Do we really need this?
|
| - '_USE_32BIT_TIME_T',
|
| - 'LOGGING_INSIDE_LIBJINGLE',
|
| 'EXPAT_RELATIVE_PATH',
|
| - 'JSONCPP_RELATIVE_PATH',
|
| - 'WEBRTC_RELATIVE_PATH',
|
| + 'FEATURE_ENABLE_SSL',
|
| + 'GTEST_RELATIVE_PATH',
|
| + 'HAVE_SRTP',
|
| 'HAVE_WEBRTC_VIDEO',
|
| 'HAVE_WEBRTC_VOICE',
|
| + 'JSONCPP_RELATIVE_PATH',
|
| + 'LOGGING_INSIDE_LIBJINGLE',
|
| 'NO_SOUND_SYSTEM',
|
| - 'HAVE_SRTP',
|
| 'SRTP_RELATIVE_PATH',
|
| + 'WEBRTC_RELATIVE_PATH',
|
| + '_USE_32BIT_TIME_T',
|
| ],
|
| 'configurations': {
|
| 'Debug': {
|
| @@ -33,6 +33,7 @@
|
| 'include_dirs': [
|
| './overrides',
|
| './source',
|
| + '../../testing/gtest/include',
|
| '../../third_party/libyuv/include',
|
| ],
|
| 'dependencies': [
|
| @@ -47,11 +48,13 @@
|
| 'include_dirs': [
|
| './overrides',
|
| './source',
|
| + '../../testing/gtest/include',
|
| ],
|
| 'defines': [
|
| 'FEATURE_ENABLE_SSL',
|
| 'FEATURE_ENABLE_VOICEMAIL',
|
| 'EXPAT_RELATIVE_PATH',
|
| + 'GTEST_RELATIVE_PATH',
|
| 'JSONCPP_RELATIVE_PATH',
|
| 'WEBRTC_RELATIVE_PATH',
|
| 'NO_SOUND_SYSTEM',
|
|
|