Roll libjingle 254:257

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 713 matching lines @@
                 '<(libjingle_source)/talk/sound/soundsystemproxy.cc',
                 '<(libjingle_source)/talk/sound/soundsystemproxy.h',
               ],
               'conditions': [
                 ['OS=="win"', {
                   'sources': [
                     '<(libjingle_source)/talk/base/win32window.cc',
                     '<(libjingle_source)/talk/base/win32window.h',
                     '<(libjingle_source)/talk/base/win32windowpicker.cc',
                     '<(libjingle_source)/talk/base/win32windowpicker.h',
+                    '<(libjingle_source)/talk/media/devices/win32deviceinfo.cc',
                     '<(libjingle_source)/talk/media/devices/win32devicemanager.cc',
                     '<(libjingle_source)/talk/media/devices/win32devicemanager.h',
                   ],
                 }],
                 ['OS=="linux"', {
                   'sources': [
                     '<(libjingle_source)/talk/base/linuxwindowpicker.cc',
                     '<(libjingle_source)/talk/base/linuxwindowpicker.h',
                     '<(libjingle_source)/talk/media/devices/libudevsymboltable.cc',
                     '<(libjingle_source)/talk/media/devices/libudevsymboltable.h',
                     '<(libjingle_source)/talk/media/devices/linuxdeviceinfo.cc',
                     '<(libjingle_source)/talk/media/devices/linuxdevicemanager.cc',
                     '<(libjingle_source)/talk/media/devices/linuxdevicemanager.h',
                     '<(libjingle_source)/talk/media/devices/v4llookup.cc',
                     '<(libjingle_source)/talk/media/devices/v4llookup.h',
                     '<(libjingle_source)/talk/sound/alsasoundsystem.cc',
                     '<(libjingle_source)/talk/sound/alsasoundsystem.h',
                     '<(libjingle_source)/talk/sound/alsasymboltable.cc',
                     '<(libjingle_source)/talk/sound/alsasymboltable.h',
                     '<(libjingle_source)/talk/sound/linuxsoundsystem.cc',
                     '<(libjingle_source)/talk/sound/linuxsoundsystem.h',
                     '<(libjingle_source)/talk/sound/pulseaudiosoundsystem.cc',
                     '<(libjingle_source)/talk/sound/pulseaudiosoundsystem.h',
                     '<(libjingle_source)/talk/sound/pulseaudiosymboltable.cc',
                     '<(libjingle_source)/talk/sound/pulseaudiosymboltable.h',
                   ],
                 }],
                 ['OS=="mac"', {
                   'sources': [
+                    '<(libjingle_source)/talk/media/devices/macdeviceinfo.cc',
                     '<(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.
                       '-Wno-deprecated-declarations',
                     ],
@@ skipping 11 matching lines @@
             '<(DEPTH)/third_party/webrtc/system_wrappers/source/system_wrappers.gyp:system_wrappers',
             '<@(libjingle_peerconnection_additional_deps)',
             'libjingle',
             'libjingle_p2p',
           ],
         },  # target libjingle_peerconnection
       ],
     }],
   ],
 }