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}
Denger-Network · Aug 1, 2016 · d0e9a07 · d0e9a07
1 parent 6bc53f0
commit d0e9a07
Show file tree

Hide file tree

Showing 13 changed files with 97 additions and 674 deletions.
diff --git a/content/browser/BUILD.gn b/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) {

diff --git a/content/renderer/BUILD.gn b/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) {

diff --git a/content/test/BUILD.gn b/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",

diff --git a/jingle/BUILD.gn b/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",

diff --git a/jingle/jingle.gyp b/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',
           ],
         },
       ],

diff --git a/remoting/host/BUILD.gn b/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) {

diff --git a/remoting/protocol/BUILD.gn b/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",

diff --git a/remoting/remoting.gyp b/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',
           ],
         }],
       ],

diff --git a/remoting/signaling/BUILD.gn b/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 = [