diff --git a/peerconnection/DEPS b/peerconnection/DEPS
index 7f1e4fe6b..ff348b873 100644
--- a/peerconnection/DEPS
+++ b/peerconnection/DEPS
@@ -3,97 +3,75 @@ vars = {
   # If you do not know, use the full path while defining your new deps entry.
   "googlecode_url": "http://%s.googlecode.com/svn",
   "chromium_trunk" : "http://src.chromium.org/svn/trunk",
-  "chromium_revision": "120526",
-  "webrtc_revision": "1538",
-  "libjingle_revision": "115",
+  "chromium_revision": "134666",
+  # Still needs the webrtc_revision/libjingle_revision here because some of
+  # the deps have to be pulled from webrtc/libjingle repository.
+  "webrtc_revision": "2137",
+  "libjingle_revision": "136",
 }
 
 # NOTE: Prefer revision numbers to tags for svn deps. Use http rather than
 # https; the latter can cause problems for users behind proxies.
 deps = {
+  "trunk/chromium_deps":
+    File(Var("chromium_trunk") + "/src/DEPS@" + Var("chromium_revision")),
+
+  "trunk/webrtc_deps":
+    File((Var("googlecode_url") % "webrtc") + "/trunk/DEPS@" + Var("webrtc_revision")),
+
+  "trunk/third_party/webrtc":
+    From("trunk/chromium_deps", "src/third_party/webrtc"),
+
   # WebRTC deps.
-  "trunk/src":
-    (Var("googlecode_url") % "webrtc") + "/trunk/src@" + Var("webrtc_revision"),
-
-  "trunk/tools":
-    (Var("googlecode_url") % "webrtc") + "/trunk/tools@" + Var("webrtc_revision"),
-
-  "trunk/test":
-    (Var("googlecode_url") % "webrtc") + "/trunk/test@" + Var("webrtc_revision"),
-
-  "trunk/third_party/google-gflags":
-    (Var("googlecode_url") % "webrtc") + "/trunk/third_party/google-gflags@" + Var("webrtc_revision"),
-
   "trunk/third_party/libvpx":
-    (Var("googlecode_url") % "webrtc") + "/trunk/third_party/libvpx@" + Var("webrtc_revision"),
+    From("trunk/chromium_deps", "src/third_party/libvpx"),
 
   "trunk/build":
-    Var("chromium_trunk") + "/src/build@" + Var("chromium_revision"),
-
-  "trunk/testing":
-    Var("chromium_trunk") + "/src/testing@" + Var("chromium_revision"),
+    From("trunk/webrtc_deps", "trunk/build"),
 
   "trunk/testing/gtest":
-    (Var("googlecode_url") % "googletest") + "/trunk@573",
-
-  "trunk/testing/gmock":
-    (Var("googlecode_url") % "googlemock") + "/trunk@386",
+    From("trunk/chromium_deps", "src/testing/gtest"),
 
   "trunk/tools/gyp":
-    (Var("googlecode_url") % "gyp") + "/trunk@1187",
+    From("trunk/chromium_deps", "src/tools/gyp"),
 
   # Needed by build/common.gypi.
   "trunk/tools/win/supalink":
-    Var("chromium_trunk") + "/src/tools/win/supalink@" + Var("chromium_revision"),
-
-  "trunk/tools/clang/scripts":
-    Var("chromium_trunk") + "/src/tools/clang/scripts@" + Var("chromium_revision"),
-
-  "trunk/tools/python":
-    Var("chromium_trunk") + "/src/tools/python@" + Var("chromium_revision"),
-
-  "trunk/tools/valgrind":
-    Var("chromium_trunk") + "/src/tools/valgrind@" + Var("chromium_revision"),
+    From("trunk/webrtc_deps", "trunk/tools/win/supalink"),
 
   "trunk/third_party/protobuf/":
-    Var("chromium_trunk") + "/src/third_party/protobuf@" + Var("chromium_revision"),
-
-  "trunk/third_party/libvpx/source/libvpx":
-    "http://git.chromium.org/webm/libvpx.git@e479379a",
+    From("trunk/webrtc_deps", "trunk/third_party/protobuf"),
 
   "trunk/third_party/libjpeg_turbo/":
-    Var("chromium_trunk") + "/deps/third_party/libjpeg_turbo@119959",
+    From("trunk/chromium_deps", "src/third_party/libjpeg_turbo"),
 
   "trunk/third_party/libjpeg/":
-    Var("chromium_trunk") + "/src/third_party/libjpeg@" + Var("chromium_revision"),
+    From("trunk/webrtc_deps", "trunk/third_party/libjpeg"),
 
   "trunk/third_party/yasm/":
-    Var("chromium_trunk") + "/src/third_party/yasm@" + Var("chromium_revision"),
+    From("trunk/webrtc_deps", "trunk/third_party/yasm"),
 
   "trunk/third_party/expat/":
-    Var("chromium_trunk") + "/src/third_party/expat@" + Var("chromium_revision"),
-
-  "trunk/third_party/google-gflags/src":
-    (Var("googlecode_url") % "google-gflags") + "/trunk/src@45",
+    From("trunk/webrtc_deps", "trunk/third_party/expat"),
 
   "trunk/third_party/yasm/source/patched-yasm":
-    Var("chromium_trunk") + "/deps/third_party/yasm/patched-yasm@73761",
+    From("trunk/chromium_deps", "src/third_party/yasm/source/patched-yasm"),
 
-  # Used by libjpeg-turbo
-  "trunk/third_party/yasm/binaries":
-    Var("chromium_trunk") + "/deps/third_party/yasm/binaries@74228",
-
-  # TODO(andrew): roll to 164 after fixing:
-  # http://code.google.com/p/webrtc/issues/detail?id=267
   "trunk/third_party/libyuv":
-    (Var("googlecode_url") % "libyuv") + "/trunk@121",
+    From("trunk/chromium_deps", "src/third_party/libyuv"),
 
   # libjingle deps.
+  "trunk/third_party/libjingle/":
+    File(Var("chromium_trunk") + "/src/third_party/libjingle/libjingle.gyp@" + Var("chromium_revision")),
+
   "trunk/third_party/libjingle/source":
-    (Var("googlecode_url") % "libjingle") + "/trunk/@" + Var("libjingle_revision"),
+    From("trunk/chromium_deps", "src/third_party/libjingle/source"),
+
+  "trunk/third_party/libjingle/overrides/talk/base":
+    (Var("googlecode_url") % "libjingle") + "/trunk/talk/base@" + Var("libjingle_revision"),
 
   "trunk/third_party/libsrtp/":
-    Var("chromium_trunk") + "/deps/third_party/libsrtp@119742",
+    From("trunk/chromium_deps", "src/third_party/libsrtp"),
 
   "trunk/third_party/jsoncpp/":
     Var("chromium_trunk") + "/src/third_party/jsoncpp@" + Var("chromium_revision"),
@@ -106,23 +84,14 @@ deps_os = {
   "win": {
     "trunk/third_party/cygwin/":
       Var("chromium_trunk") + "/deps/third_party/cygwin@66844",
-  }
+
+    # Used by libjpeg-turbo
+    "trunk/third_party/yasm/binaries":
+      From("trunk/chromium_deps", "src/third_party/yasm/binaries"),
+  },
 }
 
 hooks = [
-  {
-    # Create a supplement.gypi file under trunk/.  This file will be picked up
-    # by gyp and we use it to set Chromium related variables (inside_chromium_build)
-    # to 0 and enable the standalone build.
-    "pattern": ".",
-    "action": ["python", "trunk/tools/create_supplement_gypi.py", "trunk/src/supplement.gypi"],
-  },
-  {
-    # Pull clang on mac. If nothing changed, or on non-mac platforms, this takes
-    # zero seconds to run. If something changed, it downloads a prebuilt clang.
-    "pattern": ".",
-    "action": ["python", "trunk/tools/clang/scripts/update.py", "--mac-only"],
-  },
   {
     # A change to a .gyp, .gypi, or to GYP itself should run the generator.
     "pattern": ".",
diff --git a/peerconnection/base/base.gyp b/peerconnection/base/base.gyp
new file mode 100644
index 000000000..aa75e00cc
--- /dev/null
+++ b/peerconnection/base/base.gyp
@@ -0,0 +1,9 @@
+# This is a dummy gyp file to satisfy libjingle.gyp.
+{
+  'targets': [
+    {
+      'target_name': 'base',
+      'type': 'none',
+    },
+  ],
+}
diff --git a/peerconnection/net/net.gyp b/peerconnection/net/net.gyp
new file mode 100644
index 000000000..d65315893
--- /dev/null
+++ b/peerconnection/net/net.gyp
@@ -0,0 +1,9 @@
+# This is a dummy gyp file to satisfy libjingle.gyp.
+{
+  'targets': [
+    {
+      'target_name': 'net',
+      'type': 'none',
+    },
+  ],
+}
diff --git a/peerconnection/peerconnection.gyp b/peerconnection/peerconnection.gyp
index e928194d2..76413dd28 100644
--- a/peerconnection/peerconnection.gyp
+++ b/peerconnection/peerconnection.gyp
@@ -7,7 +7,7 @@
 # be found in the AUTHORS file in the root of the source tree.
 
 {
-  'includes': [ 'src/build/common.gypi', ],
+  'includes': [ 'third_party/webrtc/build/common.gypi', ],
   'variables': {
     'peerconnection_sample': 'third_party/libjingle/source/talk/examples/peerconnection',
   },  
@@ -55,7 +55,7 @@
             },
           },
           'dependencies': [
-            'third_party/libjingle/libjingle.gyp:libjingle_app',
+            'third_party/libjingle/libjingle.gyp:libjingle_peerconnection',
           ],
           'include_dirs': [
             'src',
@@ -82,7 +82,7 @@
             '<(peerconnection_sample)/client/peer_connection_client.h',
           ],
           'dependencies': [
-            'third_party/libjingle/libjingle.gyp:libjingle_app',
+            'third_party/libjingle/libjingle.gyp:libjingle_peerconnection',
             # TODO(tommi): Switch to this and remove specific gtk dependency
             # sections below for cflags and link_settings.
             # '<(DEPTH)/build/linux/system.gyp:gtk',
diff --git a/peerconnection/supplement/supplement.gypi b/peerconnection/supplement/supplement.gypi
new file mode 100644
index 000000000..eec450e0e
--- /dev/null
+++ b/peerconnection/supplement/supplement.gypi
@@ -0,0 +1,11 @@
+# This file will be picked up by gyp to initialize some global settings.
+{
+  'variables': {
+    'build_with_chromium': 1,
+    'include_pulse_audio': 1,
+    'include_internal_audio_device': 1,
+    'include_internal_video_capture': 1,
+    'include_internal_video_render': 1,
+    'enable_protobuf': 1,
+  }
+}
diff --git a/peerconnection/third_party/libjingle/libjingle.gyp b/peerconnection/third_party/libjingle/libjingle.gyp
deleted file mode 100644
index f49aa3e01..000000000
--- a/peerconnection/third_party/libjingle/libjingle.gyp
+++ /dev/null
@@ -1,699 +0,0 @@
-# Copyright (c) 2012 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-{
-  # TODO(wu): Use the libjingle.gyp from chromium and get rid of this file.
-  # WebRTC no longer supports the inside_chromium_build variable.
-  'variables': {
-    'no_libjingle_logging%': 0,
-    'conditions': [
-      ['inside_chromium_build==1', {
-        'overrides': 'overrides',
-      },{
-        'overrides': 'source',
-      }],
-    ],
-  },
-  'target_defaults': {
-    'defines': [
-      'FEATURE_ENABLE_SSL',
-      'FEATURE_ENABLE_VOICEMAIL',  # TODO(ncarter): Do we really need this?
-      '_USE_32BIT_TIME_T',
-      'SAFE_TO_DEFINE_TALK_BASE_LOGGING_MACROS',
-      'EXPAT_RELATIVE_PATH',
-      'JSONCPP_RELATIVE_PATH',
-      'WEBRTC_RELATIVE_PATH',
-      'HAVE_WEBRTC',
-      'HAVE_WEBRTC_VIDEO',
-      'HAVE_WEBRTC_VOICE',
-      'HAVE_SRTP',
-      'SRTP_RELATIVE_PATH',
-    ],
-    'configurations': {
-      'Debug': {
-        'defines': [
-          # TODO(sergeyu): Fix libjingle to use NDEBUG instead of
-          # _DEBUG and remove this define. See below as well.
-          '_DEBUG',
-        ],
-      }
-    },
-    'dependencies': [
-      '../expat/expat.gyp:expat',
-    ],
-    'export_dependent_settings': [
-      '../expat/expat.gyp:expat',
-    ],
-    'include_dirs': [
-      '../../third_party/libyuv/include/',
-    ],
-    'direct_dependent_settings': {
-      'defines': [
-        'FEATURE_ENABLE_SSL',
-        'FEATURE_ENABLE_VOICEMAIL',
-        'EXPAT_RELATIVE_PATH',
-        'WEBRTC_RELATIVE_PATH',
-      ],
-      'conditions': [
-        ['OS=="win"', {
-          'link_settings': {
-            'libraries': [
-              '-lsecur32.lib',
-              '-lcrypt32.lib',
-              '-liphlpapi.lib',
-            ],
-          },
-        }],
-        ['OS=="win"', {
-          'include_dirs': [
-            '../third_party/platformsdk_win7/files/Include',
-          ],
-          'defines': [
-              '_CRT_SECURE_NO_WARNINGS',  # Suppres warnings about _vsnprinf
-          ],
-        }],
-        ['OS=="linux"', {
-          'defines': [
-            'LINUX',
-          ],
-        }],
-        ['OS=="mac"', {
-          'defines': [
-            'OSX',
-          ],
-        }],
-        ['os_posix == 1', {
-          'defines': [
-            'POSIX',
-          ],
-        }],
-        ['OS=="openbsd" or OS=="freebsd"', {
-          'defines': [
-            'BSD',
-          ],
-        }],
-        ['no_libjingle_logging==1', {
-          'defines': [
-            'NO_LIBJINGLE_LOGGING',
-          ],
-        }],
-      ],
-    },
-    'all_dependent_settings': {
-      'configurations': {
-        'Debug': {
-          'defines': [
-            # TODO(sergeyu): Fix libjingle to use NDEBUG instead of
-            # _DEBUG and remove this define. See above as well.
-            '_DEBUG',
-          ],
-        }
-      },
-    },
-    'conditions': [
-      ['inside_chromium_build==1', {
-        'defines': [
-          'NO_SOUND_SYSTEM',
-        ],
-        'include_dirs': [
-          '<(overrides)',
-          'source',
-          '../..',  # the third_party folder for webrtc includes
-          '../../third_party/expat/files',
-        ],
-        'direct_dependent_settings': {
-          'defines': [
-            'NO_SOUND_SYSTEM',
-          ],
-          'include_dirs': [
-            '<(overrides)',
-            'source',
-            '../../third_party/expat/files'
-          ],
-        },
-        'dependencies': [
-          '../../base/base.gyp:base',
-          '../../net/net.gyp:net',
-        ],
-      },{
-        'include_dirs': [
-          # the third_party folder for webrtc/ includes (non-chromium).
-          '../../src',
-          'source',
-          '../../third_party/expat/files',
-        ],
-      }],
-      ['OS=="win"', {
-        'include_dirs': [
-          '../third_party/platformsdk_win7/files/Include',
-        ],
-      }],
-      ['OS=="linux"', {
-        'defines': [
-          'LINUX',
-        ],
-      }],
-      ['OS=="mac"', {
-        'defines': [
-          'OSX',
-        ],
-      }],
-      ['os_posix == 1', {
-        'defines': [
-          'POSIX',
-        ],
-      }],
-      ['OS=="openbsd" or OS=="freebsd"', {
-        'defines': [
-          'BSD',
-        ],
-      }],
-    ],
-  },
-  'targets': [
-    {
-      'target_name': 'libjingle',
-      'type': 'static_library',
-      'sources': [
-        '<(overrides)/talk/base/basictypes.h',
-        '<(overrides)/talk/base/constructormagic.h',
-
-        # Need to override logging.h because we need
-        # SAFE_TO_DEFINE_TALK_BASE_LOGGING_MACROS to work.
-        # TODO(sergeyu): push SAFE_TO_DEFINE_TALK_BASE_LOGGING_MACROS to
-        # libjingle and remove this override.
-        '<(overrides)/talk/base/logging.h',
-
-        '<(overrides)/talk/base/scoped_ptr.h',
-
-        # Libjingle's QName is not threadsafe, so we need to use our own version
-        # here.
-        # TODO(sergeyu): Fix QName in Libjingle.
-        '<(overrides)/talk/xmllite/qname.cc',
-        '<(overrides)/talk/xmllite/qname.h',
-
-        'source/talk/base/Equifax_Secure_Global_eBusiness_CA-1.h',
-        'source/talk/base/asyncfile.cc',
-        'source/talk/base/asyncfile.h',
-        'source/talk/base/asynchttprequest.cc',
-        'source/talk/base/asynchttprequest.h',
-        'source/talk/base/asyncpacketsocket.h',
-        'source/talk/base/asyncsocket.cc',
-        'source/talk/base/asyncsocket.h',
-        'source/talk/base/asynctcpsocket.cc',
-        'source/talk/base/asynctcpsocket.h',
-        'source/talk/base/asyncudpsocket.cc',
-        'source/talk/base/asyncudpsocket.h',
-        'source/talk/base/autodetectproxy.cc',
-        'source/talk/base/autodetectproxy.h',
-        'source/talk/base/base64.cc',
-        'source/talk/base/base64.h',
-        'source/talk/base/basicdefs.h',
-        'source/talk/base/basicpacketsocketfactory.cc',
-        'source/talk/base/basicpacketsocketfactory.h',
-        'source/talk/base/bytebuffer.cc',
-        'source/talk/base/bytebuffer.h',
-        'source/talk/base/byteorder.h',
-        'source/talk/base/checks.cc',
-        'source/talk/base/checks.h',
-        'source/talk/base/common.cc',
-        'source/talk/base/common.h',
-        'source/talk/base/criticalsection.h',
-        'source/talk/base/cryptstring.h',
-        'source/talk/base/diskcache.cc',
-        'source/talk/base/diskcache.h',
-        'source/talk/base/event.cc',
-        'source/talk/base/event.h',
-        'source/talk/base/fileutils.cc',
-        'source/talk/base/fileutils.h',
-        'source/talk/base/firewallsocketserver.cc',
-        'source/talk/base/firewallsocketserver.h',
-        'source/talk/base/flags.cc',
-        'source/talk/base/flags.h',
-        'source/talk/base/helpers.cc',
-        'source/talk/base/helpers.h',
-        'source/talk/base/host.cc',
-        'source/talk/base/host.h',
-        'source/talk/base/httpbase.cc',
-        'source/talk/base/httpbase.h',
-        'source/talk/base/httpclient.h',
-        'source/talk/base/httpclient.cc',
-        'source/talk/base/httpcommon-inl.h',
-        'source/talk/base/httpcommon.cc',
-        'source/talk/base/httpcommon.h',
-        'source/talk/base/httprequest.cc',
-        'source/talk/base/httprequest.h',
-        'source/talk/base/ipaddress.cc',
-        'source/talk/base/ipaddress.h',
-        'source/talk/base/json.cc',
-        'source/talk/base/json.h',
-        'source/talk/base/linked_ptr.h',
-        'source/talk/base/logging.cc',
-        'source/talk/base/md5.h',
-        'source/talk/base/md5c.c',
-        'source/talk/base/messagehandler.cc',
-        'source/talk/base/messagehandler.h',
-        'source/talk/base/messagequeue.cc',
-        'source/talk/base/messagequeue.h',
-        'source/talk/base/nethelpers.cc',
-        'source/talk/base/nethelpers.h',
-        'source/talk/base/network.cc',
-        'source/talk/base/network.h',
-        'source/talk/base/pathutils.cc',
-        'source/talk/base/pathutils.h',
-        'source/talk/base/physicalsocketserver.cc',
-        'source/talk/base/physicalsocketserver.h',
-        'source/talk/base/proxydetect.cc',
-        'source/talk/base/proxydetect.h',
-        'source/talk/base/proxyinfo.cc',
-        'source/talk/base/proxyinfo.h',
-        'source/talk/base/ratetracker.cc',
-        'source/talk/base/ratetracker.h',
-        'source/talk/base/sec_buffer.h',
-        'source/talk/base/signalthread.cc',
-        'source/talk/base/signalthread.h',
-        'source/talk/base/sigslot.h',
-        'source/talk/base/sigslotrepeater.h',
-        'source/talk/base/socket.h',
-        'source/talk/base/socketadapters.cc',
-        'source/talk/base/socketadapters.h',
-        'source/talk/base/socketaddress.cc',
-        'source/talk/base/socketaddress.h',
-        'source/talk/base/socketaddresspair.cc',
-        'source/talk/base/socketaddresspair.h',
-        'source/talk/base/socketfactory.h',
-        'source/talk/base/socketpool.cc',
-        'source/talk/base/socketpool.h',
-        'source/talk/base/socketserver.h',
-        'source/talk/base/socketstream.cc',
-        'source/talk/base/socketstream.h',
-        'source/talk/base/ssladapter.cc',
-        'source/talk/base/ssladapter.h',
-        'source/talk/base/sslsocketfactory.cc',
-        'source/talk/base/sslsocketfactory.h',
-        'source/talk/base/stream.cc',
-        'source/talk/base/stream.h',
-        'source/talk/base/stringdigest.cc',
-        'source/talk/base/stringdigest.h',
-        'source/talk/base/stringencode.cc',
-        'source/talk/base/stringencode.h',
-        'source/talk/base/stringutils.cc',
-        'source/talk/base/stringutils.h',
-        'source/talk/base/task.cc',
-        'source/talk/base/task.h',
-        'source/talk/base/taskparent.cc',
-        'source/talk/base/taskparent.h',
-        'source/talk/base/taskrunner.cc',
-        'source/talk/base/taskrunner.h',
-        'source/talk/base/thread.cc',
-        'source/talk/base/thread.h',
-        'source/talk/base/time.cc',
-        'source/talk/base/time.h',
-        'source/talk/base/urlencode.cc',
-        'source/talk/base/urlencode.h',
-        'source/talk/base/worker.cc', 
-        'source/talk/base/worker.h', 
-        'source/talk/xmllite/xmlbuilder.cc',
-        'source/talk/xmllite/xmlbuilder.h',
-        'source/talk/xmllite/xmlconstants.cc',
-        'source/talk/xmllite/xmlconstants.h',
-        'source/talk/xmllite/xmlelement.cc',
-        'source/talk/xmllite/xmlelement.h',
-        'source/talk/xmllite/xmlnsstack.cc',
-        'source/talk/xmllite/xmlnsstack.h',
-        'source/talk/xmllite/xmlparser.cc',
-        'source/talk/xmllite/xmlparser.h',
-        'source/talk/xmllite/xmlprinter.cc',
-        'source/talk/xmllite/xmlprinter.h',
-        'source/talk/xmpp/asyncsocket.h',
-        'source/talk/xmpp/constants.cc',
-        'source/talk/xmpp/constants.h',
-        'source/talk/xmpp/jid.cc',
-        'source/talk/xmpp/jid.h',
-        'source/talk/xmpp/plainsaslhandler.h',
-        'source/talk/xmpp/prexmppauth.h',
-        'source/talk/xmpp/ratelimitmanager.cc',
-        'source/talk/xmpp/ratelimitmanager.h',
-        'source/talk/xmpp/saslcookiemechanism.h',
-        'source/talk/xmpp/saslhandler.h',
-        'source/talk/xmpp/saslmechanism.cc',
-        'source/talk/xmpp/saslmechanism.h',
-        'source/talk/xmpp/saslplainmechanism.h',
-        'source/talk/xmpp/xmppclient.cc',
-        'source/talk/xmpp/xmppclient.h',
-        'source/talk/xmpp/xmppclientsettings.h',
-        'source/talk/xmpp/xmppengine.h',
-        'source/talk/xmpp/xmppengineimpl.cc',
-        'source/talk/xmpp/xmppengineimpl.h',
-        'source/talk/xmpp/xmppengineimpl_iq.cc',
-        'source/talk/xmpp/xmpplogintask.cc',
-        'source/talk/xmpp/xmpplogintask.h',
-        'source/talk/xmpp/xmppstanzaparser.cc',
-        'source/talk/xmpp/xmppstanzaparser.h',
-        'source/talk/xmpp/xmpptask.cc',
-        'source/talk/xmpp/xmpptask.h',
-      ],
-      'conditions': [
-        ['inside_chromium_build==0', {
-          'sources': [ 
-            'source/talk/sound/automaticallychosensoundsystem.h', 
-            'source/talk/sound/platformsoundsystem.cc', 
-            'source/talk/sound/platformsoundsystem.h', 
-            'source/talk/sound/platformsoundsystemfactory.cc', 
-            'source/talk/sound/platformsoundsystemfactory.h', 
-            'source/talk/sound/sounddevicelocator.h', 
-            'source/talk/sound/soundinputstreaminterface.h', 
-            'source/talk/sound/soundoutputstreaminterface.h', 
-            'source/talk/sound/soundsystemfactory.h', 
-            'source/talk/sound/soundsysteminterface.cc', 
-            'source/talk/sound/soundsysteminterface.h', 
-            'source/talk/sound/soundsystemproxy.cc', 
-            'source/talk/sound/soundsystemproxy.h',
-          ],
-          'conditions' : [ 
-            ['OS=="linux"', {
-              'sources': [
-                'source/talk/sound/alsasoundsystem.cc',
-                'source/talk/sound/alsasoundsystem.h',
-                'source/talk/sound/alsasymboltable.cc',
-                'source/talk/sound/alsasymboltable.h',
-                'source/talk/sound/linuxsoundsystem.cc',
-                'source/talk/sound/linuxsoundsystem.h',
-                'source/talk/sound/pulseaudiosoundsystem.cc',
-                'source/talk/sound/pulseaudiosoundsystem.h',
-                'source/talk/sound/pulseaudiosymboltable.cc',
-                'source/talk/sound/pulseaudiosymboltable.h',
-              ],
-            }],
-          ],
-        }],
-        ['OS=="win"', {
-          'sources': [
-            '<(overrides)/talk/base/win32socketinit.cc',
-            'source/talk/base/schanneladapter.cc',
-            'source/talk/base/schanneladapter.h',
-            'source/talk/base/win32.h',
-            'source/talk/base/win32.cc',
-            'source/talk/base/win32filesystem.cc',
-            'source/talk/base/win32filesystem.h',
-            'source/talk/base/win32window.h',
-            'source/talk/base/win32window.cc',
-            'source/talk/base/win32securityerrors.cc',
-            'source/talk/base/winfirewall.cc',
-            'source/talk/base/winfirewall.h',
-            'source/talk/base/winping.cc',
-            'source/talk/base/winping.h',
-          ],
-        }],
-        ['os_posix == 1', {
-          'sources': [
-            'source/talk/base/latebindingsymboltable.cc',
-            'source/talk/base/latebindingsymboltable.h',
-            'source/talk/base/sslstreamadapter.cc',
-            'source/talk/base/sslstreamadapter.h',
-            'source/talk/base/unixfilesystem.cc',
-            'source/talk/base/unixfilesystem.h',
-          ],
-        }],
-        ['OS=="linux"', {
-          'sources': [
-            'source/talk/base/linux.cc',
-            'source/talk/base/linux.h',
-          ],
-        }],
-        ['OS=="mac"', {
-          'sources': [
-            'source/talk/base/macconversion.cc',
-            'source/talk/base/macconversion.h',
-            'source/talk/base/macutils.cc',
-            'source/talk/base/macutils.h',
-          ],
-        }],
-      ],
-      'dependencies': [
-        '<(DEPTH)/third_party/jsoncpp/jsoncpp.gyp:jsoncpp',
-      ],
-    },
-    # This has to be is a separate project due to a bug in MSVS:
-    # https://connect.microsoft.com/VisualStudio/feedback/details/368272/duplicate-cpp-filename-in-c-project-visual-studio-2008
-    # We have two files named "constants.cc" and MSVS doesn't handle this
-    # properly.
-    {
-      'target_name': 'libjingle_p2p',
-      'type': 'static_library',
-      'sources': [
-        'source/talk/p2p/base/candidate.h',
-        'source/talk/p2p/base/common.h',
-        'source/talk/p2p/base/constants.cc',
-        'source/talk/p2p/base/constants.h',
-        'source/talk/p2p/base/p2ptransport.cc',
-        'source/talk/p2p/base/p2ptransport.h',
-        'source/talk/p2p/base/p2ptransportchannel.cc',
-        'source/talk/p2p/base/p2ptransportchannel.h',
-        'source/talk/p2p/base/port.cc',
-        'source/talk/p2p/base/port.h',
-        'source/talk/p2p/base/portallocator.cc',
-        'source/talk/p2p/base/portallocator.h',
-        'source/talk/p2p/base/portallocatorsessionproxy.cc',
-        'source/talk/p2p/base/portallocatorsessionproxy.h',
-        'source/talk/p2p/base/portproxy.cc',
-        'source/talk/p2p/base/portproxy.h',
-        'source/talk/p2p/base/pseudotcp.cc',
-        'source/talk/p2p/base/pseudotcp.h',
-        'source/talk/p2p/base/rawtransport.cc',
-        'source/talk/p2p/base/rawtransport.h',
-        'source/talk/p2p/base/rawtransportchannel.cc',
-        'source/talk/p2p/base/rawtransportchannel.h',
-        'source/talk/p2p/base/relayport.cc',
-        'source/talk/p2p/base/relayport.h',
-        'source/talk/p2p/base/session.cc',
-        'source/talk/p2p/base/session.h',
-        'source/talk/p2p/base/sessionclient.h',
-        'source/talk/p2p/base/sessiondescription.cc',
-        'source/talk/p2p/base/sessiondescription.h',
-        'source/talk/p2p/base/sessionid.h',
-        'source/talk/p2p/base/sessionmanager.cc',
-        'source/talk/p2p/base/sessionmanager.h',
-        'source/talk/p2p/base/sessionmessages.cc',
-        'source/talk/p2p/base/sessionmessages.h',
-        'source/talk/p2p/base/parsing.cc',
-        'source/talk/p2p/base/parsing.h',
-        'source/talk/p2p/base/stun.cc',
-        'source/talk/p2p/base/stun.h',
-        'source/talk/p2p/base/stunport.cc',
-        'source/talk/p2p/base/stunport.h',
-        'source/talk/p2p/base/stunrequest.cc',
-        'source/talk/p2p/base/stunrequest.h',
-        'source/talk/p2p/base/tcpport.cc',
-        'source/talk/p2p/base/tcpport.h',
-        'source/talk/p2p/base/transport.cc',
-        'source/talk/p2p/base/transport.h',
-        'source/talk/p2p/base/transportchannel.cc',
-        'source/talk/p2p/base/transportchannel.h',
-        'source/talk/p2p/base/transportchannelimpl.h',
-        'source/talk/p2p/base/transportchannelproxy.cc',
-        'source/talk/p2p/base/transportchannelproxy.h',
-        'source/talk/p2p/base/udpport.cc',
-        'source/talk/p2p/base/udpport.h',
-        'source/talk/p2p/client/basicportallocator.cc',
-        'source/talk/p2p/client/basicportallocator.h',
-        'source/talk/p2p/client/httpportallocator.cc',
-        'source/talk/p2p/client/httpportallocator.h',
-        'source/talk/p2p/client/sessionmanagertask.h',
-        'source/talk/p2p/client/sessionsendtask.h',
-        'source/talk/p2p/client/socketmonitor.cc',
-        'source/talk/p2p/client/socketmonitor.h',
-        'source/talk/session/phone/audiomonitor.cc',
-        'source/talk/session/phone/audiomonitor.h',
-        'source/talk/session/phone/call.cc',
-        'source/talk/session/phone/call.h',
-        'source/talk/session/phone/channel.cc',
-        'source/talk/session/phone/channel.h',
-        'source/talk/session/phone/channelmanager.cc',
-        'source/talk/session/phone/channelmanager.h',
-        'source/talk/session/phone/codec.cc',
-        'source/talk/session/phone/codec.h',
-        'source/talk/session/phone/cryptoparams.h',
-        'source/talk/session/phone/currentspeakermonitor.cc',
-        'source/talk/session/phone/currentspeakermonitor.h',
-        'source/talk/session/phone/devicemanager.cc',
-        'source/talk/session/phone/devicemanager.h',
-        'source/talk/session/phone/filemediaengine.cc',
-        'source/talk/session/phone/filemediaengine.h',   
-        'source/talk/session/phone/mediachannel.h',
-        'source/talk/session/phone/mediaengine.cc',
-        'source/talk/session/phone/mediaengine.h',
-        'source/talk/session/phone/mediamessages.cc',
-        'source/talk/session/phone/mediamessages.h',
-        'source/talk/session/phone/mediamonitor.cc',
-        'source/talk/session/phone/mediamonitor.h',
-        'source/talk/session/phone/mediasession.cc',
-        'source/talk/session/phone/mediasession.h',
-        'source/talk/session/phone/mediasessionclient.cc',
-        'source/talk/session/phone/mediasessionclient.h',
-        'source/talk/session/phone/mediasink.h',
-        'source/talk/session/phone/rtcpmuxfilter.cc',
-        'source/talk/session/phone/rtcpmuxfilter.h',        
-        'source/talk/session/phone/rtpdump.cc',
-        'source/talk/session/phone/rtpdump.h',
-        'source/talk/session/phone/rtputils.cc',
-        'source/talk/session/phone/rtputils.h',
-        'source/talk/session/phone/soundclip.cc',
-        'source/talk/session/phone/soundclip.h',
-        'source/talk/session/phone/srtpfilter.cc',
-        'source/talk/session/phone/srtpfilter.h',
-        'source/talk/session/phone/ssrcmuxfilter.cc',
-        'source/talk/session/phone/ssrcmuxfilter.h',
-        'source/talk/session/phone/streamparams.cc',
-        'source/talk/session/phone/videocapturer.cc',
-        'source/talk/session/phone/videocapturer.h',
-        'source/talk/session/phone/videocommon.cc',
-        'source/talk/session/phone/videocommon.h',
-        'source/talk/session/phone/videoframe.cc',
-        'source/talk/session/phone/videoframe.h',
-        'source/talk/session/phone/voicechannel.h',
-        'source/talk/session/phone/webrtcpassthroughrender.cc',
-        'source/talk/session/phone/webrtccommon.h',
-        'source/talk/session/phone/webrtcvideocapturer.cc',
-        'source/talk/session/phone/webrtcvideocapturer.h',
-        'source/talk/session/phone/webrtcvideoengine.cc',
-        'source/talk/session/phone/webrtcvideoengine.h',
-        'source/talk/session/phone/webrtcvideoframe.cc',
-        'source/talk/session/phone/webrtcvideoframe.h',
-        'source/talk/session/phone/webrtcvie.h',
-        'source/talk/session/phone/webrtcvoe.h',
-        'source/talk/session/phone/webrtcvoiceengine.cc',
-        'source/talk/session/phone/webrtcvoiceengine.h',
-        'source/talk/session/tunnel/pseudotcpchannel.cc',
-        'source/talk/session/tunnel/pseudotcpchannel.h',
-        'source/talk/session/tunnel/tunnelsessionclient.cc',
-        'source/talk/session/tunnel/tunnelsessionclient.h',
-      ],
-      'conditions': [
-        ['OS=="win"', {
-          'sources': [
-            'source/talk/session/phone/gdivideorenderer.cc',
-            'source/talk/session/phone/gdivideorenderer.h',
-            'source/talk/session/phone/win32devicemanager.cc',
-            'source/talk/session/phone/win32devicemanager.h',
-          ],
-        }],   
-        ['OS=="linux"', {
-          'sources': [
-            'source/talk/session/phone/gtkvideorenderer.cc',
-            'source/talk/session/phone/gtkvideorenderer.cc',
-            'source/talk/session/phone/gtkvideorenderer.h', 
-            'source/talk/session/phone/libudevsymboltable.cc',
-            'source/talk/session/phone/libudevsymboltable.h',
-            'source/talk/session/phone/linuxdevicemanager.cc',
-            'source/talk/session/phone/linuxdevicemanager.h',
-            'source/talk/session/phone/v4llookup.cc',
-            'source/talk/session/phone/v4llookup.h',
-          ],
-          'include_dirs': [
-            'source/talk/third_party/libudev',
-          ],
-          'cflags': [
-             '<!@(pkg-config --cflags gtk+-2.0)',
-          ],
-        }],        
-        ['inside_chromium_build==1', {
-          'dependencies': [
-            '../../third_party/webrtc/modules/modules.gyp:audio_device',
-            '../../third_party/webrtc/modules/modules.gyp:video_capture_module',
-            '../../third_party/webrtc/modules/modules.gyp:video_render_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',
-            '<(DEPTH)/third_party/libsrtp/libsrtp.gyp:libsrtp',
-            'libjingle',
-          ],
-        }, {
-          'dependencies': [
-            '../../src/modules/modules.gyp:audio_device',
-            '../../src/modules/modules.gyp:video_capture_module',
-            '../../src/modules/modules.gyp:video_render_module',
-            '../../src/system_wrappers/source/system_wrappers.gyp:system_wrappers',
-            '../../src/video_engine/video_engine.gyp:video_engine_core',
-            '../../src/voice_engine/voice_engine.gyp:voice_engine_core',
-            '<(DEPTH)/third_party/libsrtp/libsrtp.gyp:libsrtp',
-            'libjingle',
-          ],
-        } ],  # inside_chromium_build
-      ],  # conditions
-    },
-    # seperate project for app
-    {
-      'target_name': 'libjingle_app',
-      'type': '<(library)',
-      'sources': [        
-        'source/talk/app/webrtc/audiotrackimpl.cc',
-        'source/talk/app/webrtc/audiotrackimpl.h',
-        'source/talk/app/webrtc/mediastream.h',
-        'source/talk/app/webrtc/mediastreamhandler.cc',
-        'source/talk/app/webrtc/mediastreamhandler.h',
-        'source/talk/app/webrtc/mediastreamimpl.cc',
-        'source/talk/app/webrtc/mediastreamimpl.h',
-        'source/talk/app/webrtc/mediastreamprovider.h',
-        'source/talk/app/webrtc/mediastreamproxy.cc',
-        'source/talk/app/webrtc/mediastreamproxy.h',
-        'source/talk/app/webrtc/mediastreamtrackproxy.cc',
-        'source/talk/app/webrtc/mediastreamtrackproxy.h',
-        'source/talk/app/webrtc/mediatrackimpl.h',
-        'source/talk/app/webrtc/notifierimpl.h',
-        'source/talk/app/webrtc/peerconnection.h',
-        'source/talk/app/webrtc/peerconnectionfactoryimpl.cc',
-        'source/talk/app/webrtc/peerconnectionfactoryimpl.h',
-        'source/talk/app/webrtc/peerconnectionimpl.cc',
-        'source/talk/app/webrtc/peerconnectionimpl.h',
-        'source/talk/app/webrtc/peerconnectionsignaling.cc',
-        'source/talk/app/webrtc/peerconnectionsignaling.h',
-        'source/talk/app/webrtc/portallocatorfactory.cc',
-        'source/talk/app/webrtc/portallocatorfactory.h',
-        'source/talk/app/webrtc/roaperrorcodes.h',
-        'source/talk/app/webrtc/roapmessages.cc',
-        'source/talk/app/webrtc/roapmessages.h',
-        'source/talk/app/webrtc/roapsession.cc',
-        'source/talk/app/webrtc/roapsession.h',
-        'source/talk/app/webrtc/sessiondescriptionprovider.h',
-        'source/talk/app/webrtc/streamcollectionimpl.h',
-        'source/talk/app/webrtc/videorendererimpl.cc',
-        'source/talk/app/webrtc/videotrackimpl.cc',
-        'source/talk/app/webrtc/videotrackimpl.h',
-        'source/talk/app/webrtc/webrtcjson.cc',
-        'source/talk/app/webrtc/webrtcjson.h',
-        'source/talk/app/webrtc/webrtcsdp.cc',
-        'source/talk/app/webrtc/webrtcsdp.h',
-        'source/talk/app/webrtc/webrtcsession.cc',
-        'source/talk/app/webrtc/webrtcsession.h',
-        'source/talk/app/webrtc/webrtcsessionobserver.h',
-      ],
-      'dependencies': [
-        '<(DEPTH)/third_party/jsoncpp/jsoncpp.gyp:jsoncpp',
-        '<(DEPTH)/third_party/libsrtp/libsrtp.gyp:libsrtp',
-      ],
-      'conditions': [
-        ['inside_chromium_build==1', {        
-          'dependencies': [
-            '../../third_party/webrtc/modules/modules.gyp:video_capture_module',
-            '../../third_party/webrtc/modules/modules.gyp:video_render_module',
-            '../../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/system_wrappers/source/system_wrappers.gyp:system_wrappers',
-            'libjingle_p2p',
-          ],          
-        }, {
-          'dependencies': [
-            '../../src/modules/modules.gyp:video_capture_module',
-            '../../src/modules/modules.gyp:video_render_module',
-            '../../src/video_engine/video_engine.gyp:video_engine_core',
-            '../../src/voice_engine/voice_engine.gyp:voice_engine_core',
-            '../../src/system_wrappers/source/system_wrappers.gyp:system_wrappers',
-            'libjingle_p2p',
-          ],          
-        } ],  # inside_chromium_build
-      ],  # conditions
-    },    
-  ],
-}