Migrate libjingle to WebRTC build targets.

This is a large improvement from the previous duplicated lists of
source files in WebRTC. This moves over to using the GYP/GN targets
in third_party/webrtc instead, which has become possible after landing
https://codereview.webrtc.org/1924663003/ and
https://codereview.webrtc.org/2037983002/.

BUG=webrtc:4256
TESTED=Local builds passing for Linux and Android.

Review-Url: https://codereview.chromium.org/2022833002
Cr-Commit-Position: refs/heads/master@{#408931}

content/browser/BUILD.gn

@@ -191,6 +191,7 @@ source_set("browser") {
       "//third_party/libjingle:libjingle_webrtc",
       "//third_party/webrtc",
       "//third_party/webrtc/base:rtc_base",
+      "//third_party/webrtc/media:rtc_media",
       "//third_party/webrtc/modules/desktop_capture:primitives",
     ]
     if (is_linux || is_mac || is_win) {

content/renderer/BUILD.gn

@@ -172,13 +172,17 @@ target(link_target_type, "renderer") {
     deps += [
       "//crypto",
       "//third_party/libjingle:libjingle_webrtc",
-      "//third_party/libjingle:libstunprober",
       "//third_party/libvpx",
+      "//third_party/webrtc/api:libjingle_peerconnection",
       "//third_party/webrtc/base:rtc_base",
       "//third_party/webrtc/common_video",
+      "//third_party/webrtc/media:rtc_media",
       "//third_party/webrtc/modules/audio_device",
       "//third_party/webrtc/modules/audio_processing",
       "//third_party/webrtc/modules/video_coding:webrtc_h264",
+      "//third_party/webrtc/p2p:libstunprober",
+      "//third_party/webrtc/p2p:rtc_p2p",
+      "//third_party/webrtc/pc:rtc_pc",
       "//third_party/webrtc/system_wrappers",
     ]
     if (rtc_use_h264) {

content/test/BUILD.gn

@@ -149,7 +149,9 @@ static_library("test_support") {
 
     deps += [
       "//third_party/libjingle:libjingle_webrtc",
+      "//third_party/webrtc/api:libjingle_peerconnection",
       "//third_party/webrtc/base:rtc_base",
+      "//third_party/webrtc/media:rtc_media",
       "//third_party/webrtc/modules/video_capture",
     ]
   }
@@ -728,7 +730,9 @@ test("content_unittests") {
     deps += [
       "//media/blink",
       "//third_party/libjingle:libjingle_webrtc",
+      "//third_party/webrtc/api:libjingle_peerconnection",
       "//third_party/webrtc/base:rtc_base",
+      "//third_party/webrtc/media:rtc_media",
       "//third_party/webrtc/modules/desktop_capture:primitives",
       "//third_party/webrtc/modules/video_capture",
       "//ui/shell_dialogs:shell_dialogs",

jingle/BUILD.gn

@@ -90,6 +90,8 @@ if (enable_webrtc || !is_android) {
 
     public_deps = [
       "//third_party/libjingle",
+      "//third_party/webrtc/libjingle/xmllite",
+      "//third_party/webrtc/libjingle/xmpp",
     ]
     deps = [
       ":jingle_glue",
@@ -163,6 +165,8 @@ if (enable_webrtc || !is_android) {
 
     public_deps = [
       "//third_party/libjingle",
+      "//third_party/webrtc/libjingle/xmllite",
+      "//third_party/webrtc/libjingle/xmpp",
     ]
     deps = [
       ":jingle_glue",

jingle/jingle.gyp

@@ -96,11 +96,15 @@
             '../net/net.gyp:net',
             '../third_party/expat/expat.gyp:expat',
             '../third_party/libjingle/libjingle.gyp:libjingle',
+            '../third_party/webrtc/libjingle/xmllite/xmllite.gyp:rtc_xmllite',
+            '../third_party/webrtc/libjingle/xmpp/xmpp.gyp:rtc_xmpp',
             '../url/url.gyp:url_lib',
             'jingle_glue',
           ],
           'export_dependent_settings': [
             '../third_party/libjingle/libjingle.gyp:libjingle',
+            '../third_party/webrtc/libjingle/xmllite/xmllite.gyp:rtc_xmllite',
+            '../third_party/webrtc/libjingle/xmpp/xmpp.gyp:rtc_xmpp',
           ],
         },
         # GN version: //jingle:notifier_test_util
@@ -175,6 +179,8 @@
             '../testing/gmock.gyp:gmock',
             '../testing/gtest.gyp:gtest',
             '../third_party/libjingle/libjingle.gyp:libjingle',
+            '../third_party/webrtc/libjingle/xmllite/xmllite.gyp:rtc_xmllite',
+            '../third_party/webrtc/libjingle/xmpp/xmpp.gyp:rtc_xmpp',
           ],
         },
       ],

remoting/host/BUILD.gn

@@ -281,6 +281,8 @@ static_library("test_support") {
   if (enable_webrtc) {
     public_deps += [
       "//third_party/libjingle:libjingle_webrtc",
+      "//third_party/webrtc/libjingle/xmllite",
+      "//third_party/webrtc/libjingle/xmpp",
       "//third_party/webrtc/modules/desktop_capture",
     ]
   }
@@ -767,7 +769,11 @@ if (enable_remoting_host && !is_android) {
     }
 
     if (enable_webrtc) {
-      deps += [ "//third_party/libjingle:libjingle_webrtc" ]
+      deps += [
+        "//third_party/libjingle:libjingle_webrtc",
+        "//third_party/webrtc/libjingle/xmllite",
+        "//third_party/webrtc/libjingle/xmpp",
+      ]
     }
   }
 
@@ -893,7 +899,11 @@ if (enable_me2me_host) {
     }
 
     if (enable_webrtc) {
-      deps += [ "//third_party/libjingle:libjingle_webrtc" ]
+      deps += [
+        "//third_party/libjingle:libjingle_webrtc",
+        "//third_party/webrtc/libjingle/xmllite",
+        "//third_party/webrtc/libjingle/xmpp",
+      ]
     }
 
     if (is_desktop_linux) {

remoting/protocol/BUILD.gn

@@ -39,7 +39,11 @@ static_library("protocol") {
                     "//remoting")
 
     if (enable_webrtc) {
-      deps += [ "//third_party/libjingle:libjingle_webrtc" ]
+      deps += [
+        "//third_party/libjingle:libjingle_webrtc",
+        "//third_party/webrtc/libjingle/xmllite",
+        "//third_party/webrtc/libjingle/xmpp",
+      ]
     } else {
       sources -= [
         "webrtc_connection_to_client.cc",

remoting/remoting.gyp

@@ -239,11 +239,15 @@
         '../third_party/boringssl/boringssl.gyp:boringssl',
         '../third_party/expat/expat.gyp:expat',
         '../third_party/libjingle/libjingle.gyp:libjingle',
+        '../third_party/webrtc/libjingle/xmllite/xmllite.gyp:rtc_xmllite',
+        '../third_party/webrtc/libjingle/xmpp/xmpp.gyp:rtc_xmpp',
         '../third_party/libyuv/libyuv.gyp:libyuv',
         'remoting_base',
       ],
       'export_dependent_settings': [
         '../third_party/libjingle/libjingle.gyp:libjingle',
+        '../third_party/webrtc/libjingle/xmllite/xmllite.gyp:rtc_xmllite',
+        '../third_party/webrtc/libjingle/xmpp/xmpp.gyp:rtc_xmpp',
       ],
       'sources': [
         '<@(remoting_protocol_sources)',
@@ -254,6 +258,8 @@
         ['enable_webrtc == 1', {
           'dependencies': [
             '../third_party/libjingle/libjingle.gyp:libjingle_webrtc',
+            '../third_party/webrtc/libjingle/xmllite/xmllite.gyp:rtc_xmllite',
+            '../third_party/webrtc/libjingle/xmpp/xmpp.gyp:rtc_xmpp',
           ],
         }],
       ],

remoting/signaling/BUILD.gn

@@ -17,6 +17,8 @@ static_library("signaling") {
   public_deps = [
     "//remoting/proto",
     "//third_party/libjingle",
+    "//third_party/webrtc/libjingle/xmllite",
+    "//third_party/webrtc/libjingle/xmpp",
   ]
 
   deps = [

third_party/libjingle/libjingle_common.gypi

@@ -3,112 +3,14 @@
 # found in the LICENSE file.
 
 {
-  'variables': {
-    'nacl_untrusted_build%': 0,
-    'webrtc_p2p': "../webrtc/p2p",
-    'webrtc_xmpp': "../webrtc/libjingle/xmpp",
-  },
   'sources': [
     '../webrtc_overrides/field_trial.cc',
-    '<(webrtc_p2p)/base/asyncstuntcpsocket.cc',
-    '<(webrtc_p2p)/base/asyncstuntcpsocket.h',
-    '<(webrtc_p2p)/base/basicpacketsocketfactory.cc',
-    '<(webrtc_p2p)/base/basicpacketsocketfactory.h',
-    '<(webrtc_p2p)/base/candidate.h',
-    '<(webrtc_p2p)/base/common.h',
-    '<(webrtc_p2p)/base/dtlstransport.h',
-    '<(webrtc_p2p)/base/dtlstransportchannel.cc',
-    '<(webrtc_p2p)/base/dtlstransportchannel.h',
-    '<(webrtc_p2p)/base/p2pconstants.cc',
-    '<(webrtc_p2p)/base/p2pconstants.h',
-    '<(webrtc_p2p)/base/p2ptransport.cc',
-    '<(webrtc_p2p)/base/p2ptransport.h',
-    '<(webrtc_p2p)/base/p2ptransportchannel.cc',
-    '<(webrtc_p2p)/base/p2ptransportchannel.h',
-    '<(webrtc_p2p)/base/port.cc',
-    '<(webrtc_p2p)/base/port.h',
-    '<(webrtc_p2p)/base/portallocator.cc',
-    '<(webrtc_p2p)/base/portallocator.h',
-    '<(webrtc_p2p)/base/pseudotcp.cc',
-    '<(webrtc_p2p)/base/pseudotcp.h',
-    '<(webrtc_p2p)/base/relayport.cc',
-    '<(webrtc_p2p)/base/relayport.h',
-    '<(webrtc_p2p)/base/session.cc',
-    '<(webrtc_p2p)/base/session.h',
-    '<(webrtc_p2p)/base/sessiondescription.cc',
-    '<(webrtc_p2p)/base/sessiondescription.h',
-    '<(webrtc_p2p)/base/sessionid.h',
-    '<(webrtc_p2p)/base/stun.cc',
-    '<(webrtc_p2p)/base/stun.h',
-    '<(webrtc_p2p)/base/stunport.cc',
-    '<(webrtc_p2p)/base/stunport.h',
-    '<(webrtc_p2p)/base/stunrequest.cc',
-    '<(webrtc_p2p)/base/stunrequest.h',
-    '<(webrtc_p2p)/base/tcpport.cc',
-    '<(webrtc_p2p)/base/tcpport.h',
-    '<(webrtc_p2p)/base/transport.cc',
-    '<(webrtc_p2p)/base/transport.h',
-    '<(webrtc_p2p)/base/transportchannel.cc',
-    '<(webrtc_p2p)/base/transportchannel.h',
-    '<(webrtc_p2p)/base/transportchannelimpl.h',
-    '<(webrtc_p2p)/base/transportcontroller.cc',
-    '<(webrtc_p2p)/base/transportcontroller.h',
-    '<(webrtc_p2p)/base/transportdescription.cc',
-    '<(webrtc_p2p)/base/transportdescription.h',
-    '<(webrtc_p2p)/base/transportdescriptionfactory.cc',
-    '<(webrtc_p2p)/base/transportdescriptionfactory.h',
-    '<(webrtc_p2p)/base/turnport.cc',
-    '<(webrtc_p2p)/base/turnport.h',
-    '<(webrtc_p2p)/client/basicportallocator.cc',
-    '<(webrtc_p2p)/client/basicportallocator.h',
-    '<(webrtc_p2p)/client/httpportallocator.cc',
-    '<(webrtc_p2p)/client/httpportallocator.h',
-    '<(webrtc_p2p)/client/socketmonitor.cc',
-    '<(webrtc_p2p)/client/socketmonitor.h',
-    '<(webrtc_xmpp)/asyncsocket.h',
-    '<(webrtc_xmpp)/constants.cc',
-    '<(webrtc_xmpp)/constants.h',
-    '<(webrtc_xmpp)/jid.cc',
-    '<(webrtc_xmpp)/jid.h',
-    '<(webrtc_xmpp)/plainsaslhandler.h',
-    '<(webrtc_xmpp)/prexmppauth.h',
-    '<(webrtc_xmpp)/saslcookiemechanism.h',
-    '<(webrtc_xmpp)/saslhandler.h',
-    '<(webrtc_xmpp)/saslmechanism.cc',
-    '<(webrtc_xmpp)/saslmechanism.h',
-    '<(webrtc_xmpp)/saslplainmechanism.h',
-    '<(webrtc_xmpp)/xmppclient.cc',
-    '<(webrtc_xmpp)/xmppclient.h',
-    '<(webrtc_xmpp)/xmppclientsettings.h',
-    '<(webrtc_xmpp)/xmppengine.h',
-    '<(webrtc_xmpp)/xmppengineimpl.cc',
-    '<(webrtc_xmpp)/xmppengineimpl.h',
-    '<(webrtc_xmpp)/xmppengineimpl_iq.cc',
-    '<(webrtc_xmpp)/xmpplogintask.cc',
-    '<(webrtc_xmpp)/xmpplogintask.h',
-    '<(webrtc_xmpp)/xmppstanzaparser.cc',
-    '<(webrtc_xmpp)/xmppstanzaparser.h',
-    '<(webrtc_xmpp)/xmpptask.cc',
-    '<(webrtc_xmpp)/xmpptask.h',
   ],
   'conditions': [
-    ['OS=="win" and nacl_untrusted_build==0', {
-      # Suppress warnings about WIN32_LEAN_AND_MEAN.
-      'msvs_disabled_warnings': [ 4005, 4267 ],
-    }, {
-      'sources/': [
-        ['exclude', '/win[a-z0-9]+\\.(h|cc)$'],
-      ],
-    }],
-    ['os_posix!=1 and nacl_untrusted_build==0', {
-      'sources/': [
-        ['exclude', '/unix[a-z]+\\.(h|cc)$'],
-      ],
-    }],
-    ['(OS!="mac" and OS!="ios") or nacl_untrusted_build==1', {
-      'sources/': [
-        ['exclude', '/mac[a-z]+\\.(h|cc)$'],
-        ['exclude', '/scoped_autorelease_pool\\.(h|mm)$'],
+    ['OS=="win"', {
+      'msvs_disabled_warnings': [
+        4005,  # WIN32_LEAN_AND_MEAN.
+        4267,  # size_t to int truncations.
       ],
     }],
   ],

third_party/webrtc_overrides/DEPS

@@ -2,4 +2,5 @@ include_rules = [
   '+base',
   '+net/base',
   '+third_party/webrtc',
+  '+third_party/webrtc_overrides',
 ]