Roll WebRTC 7546:7549.

third_party/libjingle/libjingle.gyp

Index: third_party/libjingle/libjingle.gyp
diff --git a/third_party/libjingle/libjingle.gyp b/third_party/libjingle/libjingle.gyp
index 9b26732bf3ca9d252b877459bececa77749f84cc..1726c3e57074dfcdf60ccac4e0c8cc60b1c05e1b 100644
--- a/third_party/libjingle/libjingle.gyp
+++ b/third_party/libjingle/libjingle.gyp
@@ -269,36 +269,14 @@
     {
       'target_name': 'libjingle',
       'type': 'static_library',
-      'includes': [ 'libjingle_common.gypi' ],
-      'sources!' : [
-        # Compiled as part of libjingle_p2p_constants.
-        '<(libjingle_source)/talk/p2p/base/constants.cc',
-        '<(libjingle_source)/talk/p2p/base/constants.h',
-      ],
       'dependencies': [
         '<(DEPTH)/third_party/webrtc/base/base.gyp:webrtc_base',
         '<(DEPTH)/third_party/webrtc/libjingle/xmllite/xmllite.gyp:rtc_xmllite',
-        'libjingle_p2p_constants',
+        '<(DEPTH)/third_party/webrtc/libjingle/xmpp/xmpp.gyp:rtc_xmpp',
+        '<(DEPTH)/third_party/webrtc/p2p/p2p.gyp:rtc_p2p',
         '<@(libjingle_additional_deps)',
       ],
     },  # target libjingle
-    # This has to be is a separate project due to a bug in MSVS 2008 and the
-    # current toolset on android.  The problem is that we have two files named
-    # "constants.cc" and MSVS/android doesn't handle this properly.
-    # GYP currently has guards to catch this, so if you want to remove it,
-    # run GYP and if GYP has removed the validation check, then we can assume
-    # that the toolchains have been fixed (we currently use VS2010 and later,
-    # so VS2008 isn't a concern anymore).
-    #
-    # GN version: //third_party/libjingle:libjingle_p2p_constants
-    {
-      'target_name': 'libjingle_p2p_constants',
-      'type': 'static_library',
-      'sources': [
-        '<(libjingle_source)/talk/p2p/base/constants.cc',
-        '<(libjingle_source)/talk/p2p/base/constants.h',
-      ],
-    },  # target libjingle_p2p_constants
     # GN version: //third_party/libjingle:peerconnection_server
     {
       'target_name': 'peerconnection_server',