Revert of 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 97d29666060def4f829a3749439f74477d8de65c..69021f443b81adf00d772f9d87fe1f40884464d2 100644
--- a/third_party/libjingle/libjingle.gyp
+++ b/third_party/libjingle/libjingle.gyp
@@ -6,6 +6,12 @@
   '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': {
@@ -30,7 +36,7 @@
     'include_dirs': [
       './overrides',
       '../../third_party/webrtc_overrides',
-      './source',
+      './<(libjingle_source)',
       '../..',
       '../../testing/gtest/include',
       '../../third_party',
@@ -51,7 +57,7 @@
       'include_dirs': [
         '../../third_party/webrtc_overrides',
         './overrides',
-        './source',
+        './<(libjingle_source)',
         '../..',
         '../../testing/gtest/include',
         '../../third_party',
@@ -214,6 +220,7 @@
       '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
   ],
@@ -328,20 +335,12 @@
             '<(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/media/sctp/sctpdataengine.cc',
             '<(DEPTH)/third_party/webrtc/media/sctp/sctpdataengine.h',
             '<(DEPTH)/third_party/webrtc/pc/audiomonitor.cc',
@@ -373,8 +372,6 @@
             '<(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
@@ -391,6 +388,28 @@
             '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
       ],
     }],
   ],