Roll libjingle 132:133

third_party/libjingle/libjingle.gyp

 # Copyright (c) 2012 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.
 
 {
   'includes': [
     '../../build/win_precompile.gypi',
   ],
   'target_defaults': {
     'defines': [
+      'EXPAT_RELATIVE_PATH',
       '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',
+      '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': {
         'defines': [
           # TODO(sergeyu): Fix libjingle to use NDEBUG instead of
           # _DEBUG and remove this define. See below as well.
           '_DEBUG',
         ],
       }
     },
     'include_dirs': [
       './overrides',
       './source',
+      '../../testing/gtest/include',
       '../../third_party/libyuv/include',
     ],
     'dependencies': [
       '<(DEPTH)/base/base.gyp:base',
       '<(DEPTH)/net/net.gyp:net',
       '<(DEPTH)/third_party/expat/expat.gyp:expat',
     ],
     'export_dependent_settings': [
       '<(DEPTH)/third_party/expat/expat.gyp:expat',
     ],
     'direct_dependent_settings': {
       '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',
       ],
       'conditions': [
         ['OS=="win"', {
           'link_settings': {
             'libraries': [
               '-lsecur32.lib',
               '-lcrypt32.lib',
@@ skipping 101 matching lines @@
       'type': 'static_library',
       'sources': [
         'overrides/talk/base/basictypes.h',
         'overrides/talk/base/constructormagic.h',
 
         # Overrides logging.h/.cc because libjingle logging should be done to
         # the same place as the chromium logging.
         'overrides/talk/base/logging.cc',
         'overrides/talk/base/logging.h',
 
-        'overrides/talk/base/scoped_ptr.h',
-        
         # TODO(ronghuawu): Remove below overrides once below bug is fixed:
         # http://crbug.com/115702
         'overrides/talk/base/messagequeue.cc',
         'overrides/talk/base/messagequeue.h',
         'overrides/talk/base/thread.cc',
         'overrides/talk/base/thread.h',
 
         'source/talk/base/Equifax_Secure_Global_eBusiness_CA-1.h',
         'source/talk/base/asyncfile.cc',
         'source/talk/base/asyncfile.h',
@@ skipping 66 matching lines @@
         'source/talk/base/physicalsocketserver.cc',
         'source/talk/base/physicalsocketserver.h',
         'source/talk/base/proxydetect.cc',
         'source/talk/base/proxydetect.h',
         'source/talk/base/proxyinfo.cc',
         'source/talk/base/proxyinfo.h',
         'source/talk/base/ratelimiter.cc',
         'source/talk/base/ratelimiter.h',
         'source/talk/base/ratetracker.cc',
         'source/talk/base/ratetracker.h',
+        'source/talk/base/scoped_ptr.h',
         'source/talk/base/sec_buffer.h',
         'source/talk/base/sha1.c',
         'source/talk/base/sha1.h',
         'source/talk/base/signalthread.cc',
         'source/talk/base/signalthread.h',
         'source/talk/base/sigslot.h',
         'source/talk/base/sigslotrepeater.h',
         'source/talk/base/socket.h',
         'source/talk/base/socketadapters.cc',
         'source/talk/base/socketadapters.h',
@@ skipping 349 matching lines @@
             '<(DEPTH)/third_party/webrtc/voice_engine/voice_engine.gyp:voice_engine_core',
             '<(DEPTH)/third_party/webrtc/system_wrappers/source/system_wrappers.gyp:system_wrappers',
             'libjingle',
             'libjingle_p2p',
           ],
         }],
       ],
     },  # target libjingle_peerconnection
   ],
 }