Remove libpeerconnection target from third_party/libjingle

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 3c3ecfba97d5db58706ffec5c5dd901b932e452f..af88f188b4a7249ed8657c69ceaaff4618e2d0a8 100644
--- a/third_party/libjingle/libjingle.gyp
+++ b/third_party/libjingle/libjingle.gyp
@@ -6,12 +6,6 @@
   'includes': [
     '../../build/win_precompile.gypi',
   ],
-  'variables': {
-    'libjingle_additional_deps%': [],
-    'libjingle_peerconnection_additional_deps%': [],
-    'libjingle_source%': "source",
-    'webrtc_xmpp': "../webrtc/libjingle/xmpp",
-  },
   # Most of these settings have been split according to their scope into
   # :jingle_unexported_configs and :jingle_public_config in the GN build.
   'target_defaults': {
@@ -35,7 +29,7 @@
     'include_dirs': [
       './overrides',
       '../../third_party/webrtc_overrides',
-      './<(libjingle_source)',
+      './source',
       '../..',
       '../../testing/gtest/include',
       '../../third_party',
@@ -56,7 +50,7 @@
       'include_dirs': [
         '../../third_party/webrtc_overrides',
         './overrides',
-        './<(libjingle_source)',
+        './source',
         '../..',
         '../../testing/gtest/include',
         '../../third_party',
@@ -219,7 +213,6 @@
       'dependencies': [
         '<(DEPTH)/third_party/webrtc/base/base.gyp:rtc_base',
         '<(DEPTH)/third_party/webrtc/libjingle/xmllite/xmllite.gyp:rtc_xmllite',
-        '<@(libjingle_additional_deps)',
       ],
     },  # target libjingle
   ],
@@ -341,12 +334,20 @@
             '<(DEPTH)/third_party/webrtc/media/base/videoframefactory.h',
             '<(DEPTH)/third_party/webrtc/media/base/videosourcebase.cc',
             '<(DEPTH)/third_party/webrtc/media/base/videosourcebase.h',
+            '<(DEPTH)/third_party/webrtc/media/engine/simulcast.cc',
+            '<(DEPTH)/third_party/webrtc/media/engine/simulcast.h',
             '<(DEPTH)/third_party/webrtc/media/engine/webrtccommon.h',
+            '<(DEPTH)/third_party/webrtc/media/engine/webrtcmediaengine.cc',
+            '<(DEPTH)/third_party/webrtc/media/engine/webrtcmediaengine.h',
+            '<(DEPTH)/third_party/webrtc/media/engine/webrtcvideoengine2.cc',
+            '<(DEPTH)/third_party/webrtc/media/engine/webrtcvideoengine2.h',
             '<(DEPTH)/third_party/webrtc/media/engine/webrtcvideoframe.cc',
             '<(DEPTH)/third_party/webrtc/media/engine/webrtcvideoframe.h',
             '<(DEPTH)/third_party/webrtc/media/engine/webrtcvideoframefactory.cc',
             '<(DEPTH)/third_party/webrtc/media/engine/webrtcvideoframefactory.h',
             '<(DEPTH)/third_party/webrtc/media/engine/webrtcvoe.h',
+            '<(DEPTH)/third_party/webrtc/media/engine/webrtcvoiceengine.cc',
+            '<(DEPTH)/third_party/webrtc/media/engine/webrtcvoiceengine.h',
             '<(DEPTH)/third_party/webrtc/pc/audiomonitor.cc',
             '<(DEPTH)/third_party/webrtc/pc/audiomonitor.h',
             '<(DEPTH)/third_party/webrtc/pc/bundlefilter.cc',
@@ -369,6 +370,7 @@
             '<(DEPTH)/third_party/webrtc/pc/srtpfilter.cc',
             '<(DEPTH)/third_party/webrtc/pc/srtpfilter.h',
             '<(DEPTH)/third_party/webrtc/pc/voicechannel.h',
+

[tommi (sloooow) - chröme, 2016/03/17 20:49:17]

nit: remove

[kjellander_chromium, 2016/03/17 20:55:15]

Oops, done in PS#2.

           ],
           'conditions': [
             # TODO(mallinath) - Enable SCTP for iOS.
@@ -390,6 +392,8 @@
             '<(DEPTH)/third_party/webrtc/modules/modules.gyp:media_file',
             '<(DEPTH)/third_party/webrtc/modules/modules.gyp:video_capture',
             '<(DEPTH)/third_party/webrtc/modules/modules.gyp:video_render',
+            '<(DEPTH)/third_party/webrtc/voice_engine/voice_engine.gyp:voice_engine',
+            '<(DEPTH)/third_party/webrtc/webrtc.gyp:webrtc',
             'libjingle',
           ],
         },  # target libjingle_webrtc_common
@@ -406,28 +410,6 @@
             'libjingle_webrtc_common',
           ],
         },
-        {
-          # GN version: //third_party/libjingle:libpeerconnection
-          'target_name': 'libpeerconnection',
-          'type': 'static_library',
-          'sources': [
-            # Note: sources list duplicated in GN build.
-            '<(DEPTH)/third_party/webrtc/media/engine/simulcast.cc',
-            '<(DEPTH)/third_party/webrtc/media/engine/simulcast.h',
-            '<(DEPTH)/third_party/webrtc/media/engine/webrtcmediaengine.cc',
-            '<(DEPTH)/third_party/webrtc/media/engine/webrtcmediaengine.h',
-            '<(DEPTH)/third_party/webrtc/media/engine/webrtcvideoengine2.cc',
-            '<(DEPTH)/third_party/webrtc/media/engine/webrtcvideoengine2.h',
-            '<(DEPTH)/third_party/webrtc/media/engine/webrtcvoiceengine.cc',
-            '<(DEPTH)/third_party/webrtc/media/engine/webrtcvoiceengine.h',
-          ],
-          'dependencies': [
-            '<(DEPTH)/third_party/webrtc/voice_engine/voice_engine.gyp:voice_engine',
-            '<(DEPTH)/third_party/webrtc/webrtc.gyp:webrtc',
-            '<@(libjingle_peerconnection_additional_deps)',
-            'libjingle_webrtc_common',
-          ],
-        },  # target libpeerconnection
       ],
     }],
   ],