Refactor libjingle.gyp:

* Move code out of libjingle_p2p and libjingle_peerconnection into the libjingle lib.
* Update gyp files that previously depended on libjingle_p2p to depend on libjingle.
* Only the constant files are left in the extra libs (which is why they exist).
* Move the webrtc code out into a separate target.

Review URL: https://codereview.chromium.org/12465002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@186277 0039d316-1c4b-4281-b951-d872f2087c98

content/content_renderer.gypi

@@ -336,8 +336,7 @@
     }],
     ['enable_webrtc==1', {
       'dependencies': [
-        '../third_party/libjingle/libjingle.gyp:libjingle_p2p',
-        '../third_party/libjingle/libjingle.gyp:libjingle_peerconnection',
+        '../third_party/libjingle/libjingle.gyp:libpeerconnection',
         '../third_party/webrtc/system_wrappers/source/system_wrappers.gyp:system_wrappers',
         '../third_party/webrtc/modules/modules.gyp:audio_device',
         '../third_party/webrtc/video_engine/video_engine.gyp:video_engine_core',

content/content_tests.gypi

@@ -196,12 +196,13 @@
             'test/webrtc_audio_device_test.h',
           ],
           'dependencies': [
-            '../third_party/libjingle/libjingle.gyp:libjingle_peerconnection',
+            '../third_party/libjingle/libjingle.gyp:libpeerconnection',
             '../third_party/webrtc/modules/modules.gyp:audio_device',
             '../third_party/webrtc/modules/modules.gyp:video_capture_module',
             '../third_party/webrtc/system_wrappers/source/system_wrappers.gyp:system_wrappers',
             '../third_party/webrtc/video_engine/video_engine.gyp:video_engine_core',
-            '../third_party/webrtc/voice_engine/voice_engine.gyp:voice_engine_core'],
+            '../third_party/webrtc/voice_engine/voice_engine.gyp:voice_engine_core'
+          ],
         }],
         ['toolkit_uses_gtk == 1', {
           'dependencies': [
@@ -563,7 +564,7 @@
             'renderer/media/webrtc_audio_device_unittest.cc',
           ],
           'dependencies': [
-            '../third_party/libjingle/libjingle.gyp:libjingle_peerconnection',
+            '../third_party/libjingle/libjingle.gyp:libpeerconnection',
             '../third_party/webrtc/modules/modules.gyp:video_capture_module',
             '../third_party/webrtc/system_wrappers/source/system_wrappers.gyp:system_wrappers',
             '../third_party/webrtc/video_engine/video_engine.gyp:video_engine_core',

jingle/jingle.gyp

@@ -39,11 +39,9 @@
             '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
             '../net/net.gyp:net',
             '../third_party/libjingle/libjingle.gyp:libjingle',
-            '../third_party/libjingle/libjingle.gyp:libjingle_p2p',
           ],
           'export_dependent_settings': [
             '../third_party/libjingle/libjingle.gyp:libjingle',
-            '../third_party/libjingle/libjingle.gyp:libjingle_p2p',
           ],
         },
         # A library for sending and receiving peer-issued notifications.

remoting/remoting.gyp

@@ -2289,11 +2289,9 @@
         '../jingle/jingle.gyp:jingle_glue',
         '../jingle/jingle.gyp:notifier',
         '../third_party/libjingle/libjingle.gyp:libjingle',
-        '../third_party/libjingle/libjingle.gyp:libjingle_p2p',
       ],
       'export_dependent_settings': [
         '../third_party/libjingle/libjingle.gyp:libjingle',
-        '../third_party/libjingle/libjingle.gyp:libjingle_p2p',
       ],
       'sources': [
         'jingle_glue/chromium_socket_factory.cc',