Roll webrtc 3016:3036 and libjingle 220:226

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',
   ],
   'variables': {
     'enabled_libjingle_device_manager%': 0,
@@ skipping 24 matching lines @@
           # TODO(sergeyu): Fix libjingle to use NDEBUG instead of
           # _DEBUG and remove this define. See below as well.
           '_DEBUG',
         ],
       }
     },
     'include_dirs': [
       './overrides',
       './<@(libjingle_source)',
       '../../testing/gtest/include',
+      '../../third_party',
       '../../third_party/libyuv/include',
       '../../third_party/webrtc',
     ],
     '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',
         './<@(libjingle_source)',
         '../../testing/gtest/include',
+        '../../third_party',
         '../../third_party/webrtc',
       ],
       'defines': [
         'FEATURE_ENABLE_SSL',
         'FEATURE_ENABLE_VOICEMAIL',
         'EXPAT_RELATIVE_PATH',
         'GTEST_RELATIVE_PATH',
         'JSONCPP_RELATIVE_PATH',
         'NO_MAIN_THREAD_WRAPPING',
         'NO_SOUND_SYSTEM',
@@ skipping 642 matching lines @@
             }],
             ['OS=="mac"', {
               'sources': [
                 '<@(libjingle_source)/talk/media/devices/macdevicemanager.cc',
                 '<@(libjingle_source)/talk/media/devices/macdevicemanager.h',
                 '<@(libjingle_source)/talk/media/devices/macdevicemanagermm.mm',
               ],
               'xcode_settings': {
                 'WARNING_CFLAGS': [
                   # Suppres warnings about using deprecated functions in
-                  # macdevicemanager.cc. 
+                  # macdevicemanager.cc.
                   '-Wno-deprecated-declarations',
                 ],
               },
             }],
           ],
         }],
         ['OS!="android"', {
           'dependencies': [
             # We won't build with WebRTC on Android.
             '<(DEPTH)/third_party/libsrtp/libsrtp.gyp:libsrtp',
@@ skipping 23 matching lines @@
       ],
       'include_dirs': [
         '<@(libjingle_source)',
       ],
       'dependencies': [
         'libjingle',
       ],
     }, # target peerconnection_server
   ],
 }