From 35f534529bec4ea2a2305e033d027fa1c066054b Mon Sep 17 00:00:00 2001
From: "ronghuawu@google.com"
 <ronghuawu@google.com@4adac7df-926f-26a2-2b94-8c16560cd09d>
Date: Fri, 5 Aug 2011 22:08:29 +0000
Subject: [PATCH] * Point the webrtc libjingle dependency to third_party_mods.
 * For unchanged files, change the third_party_mods libjingle.gyp to point to
 the original version of libjingle. Review URL:
 http://webrtc-codereview.appspot.com/89015

git-svn-id: http://webrtc.googlecode.com/svn/trunk@318 4adac7df-926f-26a2-2b94-8c16560cd09d
---
 DEPS                                     |   4 -
 third_party_mods/libjingle/libjingle.gyp | 734 +++++++++++------------
 webrtc.gyp                               |   3 +-
 3 files changed, 362 insertions(+), 379 deletions(-)

diff --git a/DEPS b/DEPS
index 36d6f75d02..b7d939cac3 100644
--- a/DEPS
+++ b/DEPS
@@ -63,10 +63,6 @@ deps_os = {
 }
 
 hooks = [
-  {
-    "pattern": ".",
-    "action": ["svn", "export", Var("webrtc_trunk") + "/third_party_mods/libjingle", "trunk/third_party/libjingle", "--force"],
-  },
   {
     "pattern": ".",
     "action": ["svn", "export", Var("webrtc_trunk") + "/third_party_mods/jsoncpp", "trunk/third_party/jsoncpp", "--force"],
diff --git a/third_party_mods/libjingle/libjingle.gyp b/third_party_mods/libjingle/libjingle.gyp
index 5794b4e1c9..9fad1c1753 100644
--- a/third_party_mods/libjingle/libjingle.gyp
+++ b/third_party_mods/libjingle/libjingle.gyp
@@ -4,11 +4,17 @@
 
 {
   'variables': {
-    # Chromium targets will have set inside_chromium_build to 1.
-    # We declare a default value of 0 for standalone builds.
-    'inside_chromium_build%': 0,
     'no_libjingle_logging%': 0,
     'peer_connection_dev%': 0,
+    'libjingle_orig': '../../third_party/libjingle',
+    'libjingle_mods': '.',
+    'conditions': [
+      ['inside_chromium_build==1', {
+        'overrides': '<(libjingle_orig)/overrides',
+      },{
+        'overrides': '<(libjingle_orig)/source',
+      }],
+    ],
   },
   'target_defaults': {
     'defines': [
@@ -30,10 +36,10 @@
       }
     },
     'dependencies': [
-      '../expat/expat.gyp:expat',
+      '<(libjingle_orig)/../expat/expat.gyp:expat',
     ],
     'export_dependent_settings': [
-      '../expat/expat.gyp:expat',
+      '<(libjingle_orig)/../expat/expat.gyp:expat',
     ],
     'direct_dependent_settings': {
       'defines': [
@@ -101,15 +107,17 @@
     'conditions': [
       ['inside_chromium_build==1', {
         'include_dirs': [
-          './overrides',
+          '<(overrides)',
+          '<(libjingle_mods)/source',
+          '<(libjingle_orig)/source',
           '../..',  # the third_party folder for webrtc includes
-          './source',
           '../../third_party/expat/files',
         ],
         'direct_dependent_settings': {
           'include_dirs': [
-            './overrides',
-            './source',
+            '<(overrides)',
+            '<(libjingle_mods)/source',
+            '<(libjingle_orig)/source',
             '../../third_party/expat/files'
           ],
         },
@@ -121,7 +129,8 @@
         'include_dirs': [
           # the third_party folder for webrtc/ includes (non-chromium).
           '../../src',
-          './source',
+          '<(libjingle_mods)/source',
+          '<(libjingle_orig)/source',
           '../../third_party/expat/files',
         ],
       }],
@@ -155,15 +164,6 @@
   'targets': [
     {
       'target_name': 'libjingle',
-      'variables': {
-        'conditions': [
-          ['inside_chromium_build==1', {
-            'overrides': 'overrides',
-          },{
-            'overrides': 'source',
-          }],
-        ],
-      },
       'type': 'static_library',
       'sources': [
         '<(overrides)/talk/base/basictypes.h',
@@ -183,215 +183,209 @@
         '<(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/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/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',
+        '<(libjingle_orig)/source/talk/base/Equifax_Secure_Global_eBusiness_CA-1.h',
+        '<(libjingle_orig)/source/talk/base/asyncfile.cc',
+        '<(libjingle_orig)/source/talk/base/asyncfile.h',
+        '<(libjingle_orig)/source/talk/base/asynchttprequest.cc',
+        '<(libjingle_orig)/source/talk/base/asynchttprequest.h',
+        '<(libjingle_orig)/source/talk/base/asyncpacketsocket.h',
+        '<(libjingle_orig)/source/talk/base/asyncsocket.cc',
+        '<(libjingle_orig)/source/talk/base/asyncsocket.h',
+        '<(libjingle_orig)/source/talk/base/asynctcpsocket.cc',
+        '<(libjingle_orig)/source/talk/base/asynctcpsocket.h',
+        '<(libjingle_orig)/source/talk/base/asyncudpsocket.cc',
+        '<(libjingle_orig)/source/talk/base/asyncudpsocket.h',
+        '<(libjingle_orig)/source/talk/base/autodetectproxy.cc',
+        '<(libjingle_orig)/source/talk/base/autodetectproxy.h',
+        '<(libjingle_orig)/source/talk/base/base64.cc',
+        '<(libjingle_orig)/source/talk/base/base64.h',
+        '<(libjingle_orig)/source/talk/base/basicdefs.h',
+        '<(libjingle_orig)/source/talk/base/basicpacketsocketfactory.cc',
+        '<(libjingle_orig)/source/talk/base/basicpacketsocketfactory.h',
+        '<(libjingle_orig)/source/talk/base/bytebuffer.cc',
+        '<(libjingle_orig)/source/talk/base/bytebuffer.h',
+        '<(libjingle_orig)/source/talk/base/byteorder.h',
+        '<(libjingle_orig)/source/talk/base/checks.cc',
+        '<(libjingle_orig)/source/talk/base/checks.h',
+        '<(libjingle_orig)/source/talk/base/common.cc',
+        '<(libjingle_orig)/source/talk/base/common.h',
+        '<(libjingle_orig)/source/talk/base/criticalsection.h',
+        '<(libjingle_orig)/source/talk/base/cryptstring.h',
+        '<(libjingle_orig)/source/talk/base/diskcache.cc',
+        '<(libjingle_orig)/source/talk/base/diskcache.h',
+        '<(libjingle_orig)/source/talk/base/event.cc',
+        '<(libjingle_orig)/source/talk/base/event.h',
+        '<(libjingle_orig)/source/talk/base/fileutils.cc',
+        '<(libjingle_orig)/source/talk/base/fileutils.h',
+        '<(libjingle_orig)/source/talk/base/firewallsocketserver.cc',
+        '<(libjingle_orig)/source/talk/base/firewallsocketserver.h',
+        '<(libjingle_orig)/source/talk/base/flags.cc',
+        '<(libjingle_orig)/source/talk/base/flags.h',
+        '<(libjingle_orig)/source/talk/base/helpers.cc',
+        '<(libjingle_orig)/source/talk/base/helpers.h',
+        '<(libjingle_orig)/source/talk/base/host.cc',
+        '<(libjingle_orig)/source/talk/base/host.h',
+        '<(libjingle_orig)/source/talk/base/httpbase.cc',
+        '<(libjingle_orig)/source/talk/base/httpbase.h',
+        '<(libjingle_orig)/source/talk/base/httpclient.h',
+        '<(libjingle_orig)/source/talk/base/httpclient.cc',
+        '<(libjingle_orig)/source/talk/base/httpcommon-inl.h',
+        '<(libjingle_orig)/source/talk/base/httpcommon.cc',
+        '<(libjingle_orig)/source/talk/base/httpcommon.h',
+        '<(libjingle_orig)/source/talk/base/httprequest.cc',
+        '<(libjingle_orig)/source/talk/base/httprequest.h',
+        '<(libjingle_mods)/source/talk/base/json.cc',
+        '<(libjingle_mods)/source/talk/base/json.h',
+        '<(libjingle_orig)/source/talk/base/linked_ptr.h',
+        '<(libjingle_orig)/source/talk/base/logging.cc',
+        '<(libjingle_orig)/source/talk/base/md5.h',
+        '<(libjingle_orig)/source/talk/base/md5c.c',
+        '<(libjingle_orig)/source/talk/base/messagehandler.cc',
+        '<(libjingle_orig)/source/talk/base/messagehandler.h',
+        '<(libjingle_orig)/source/talk/base/messagequeue.cc',
+        '<(libjingle_orig)/source/talk/base/messagequeue.h',
+        '<(libjingle_orig)/source/talk/base/nethelpers.cc',
+        '<(libjingle_orig)/source/talk/base/nethelpers.h',
+        '<(libjingle_orig)/source/talk/base/network.cc',
+        '<(libjingle_orig)/source/talk/base/network.h',
+        '<(libjingle_orig)/source/talk/base/pathutils.cc',
+        '<(libjingle_orig)/source/talk/base/pathutils.h',
+        '<(libjingle_orig)/source/talk/base/physicalsocketserver.cc',
+        '<(libjingle_orig)/source/talk/base/physicalsocketserver.h',
+        '<(libjingle_orig)/source/talk/base/proxydetect.cc',
+        '<(libjingle_orig)/source/talk/base/proxydetect.h',
+        '<(libjingle_orig)/source/talk/base/proxyinfo.cc',
+        '<(libjingle_orig)/source/talk/base/proxyinfo.h',
+        '<(libjingle_orig)/source/talk/base/ratetracker.cc',
+        '<(libjingle_orig)/source/talk/base/ratetracker.h',
+        '<(libjingle_orig)/source/talk/base/sec_buffer.h',
+        '<(libjingle_orig)/source/talk/base/signalthread.cc',
+        '<(libjingle_orig)/source/talk/base/signalthread.h',
+        '<(libjingle_orig)/source/talk/base/sigslot.h',
+        '<(libjingle_orig)/source/talk/base/sigslotrepeater.h',
+        '<(libjingle_orig)/source/talk/base/socket.h',
+        '<(libjingle_orig)/source/talk/base/socketadapters.cc',
+        '<(libjingle_orig)/source/talk/base/socketadapters.h',
+        '<(libjingle_orig)/source/talk/base/socketaddress.cc',
+        '<(libjingle_orig)/source/talk/base/socketaddress.h',
+        '<(libjingle_orig)/source/talk/base/socketaddresspair.cc',
+        '<(libjingle_orig)/source/talk/base/socketaddresspair.h',
+        '<(libjingle_orig)/source/talk/base/socketfactory.h',
+        '<(libjingle_orig)/source/talk/base/socketpool.cc',
+        '<(libjingle_orig)/source/talk/base/socketpool.h',
+        '<(libjingle_orig)/source/talk/base/socketserver.h',
+        '<(libjingle_orig)/source/talk/base/socketstream.cc',
+        '<(libjingle_orig)/source/talk/base/socketstream.h',
+        '<(libjingle_orig)/source/talk/base/ssladapter.cc',
+        '<(libjingle_orig)/source/talk/base/ssladapter.h',
+        '<(libjingle_orig)/source/talk/base/sslsocketfactory.cc',
+        '<(libjingle_orig)/source/talk/base/sslsocketfactory.h',
+        '<(libjingle_orig)/source/talk/base/stream.cc',
+        '<(libjingle_orig)/source/talk/base/stream.h',
+        '<(libjingle_orig)/source/talk/base/stringdigest.cc',
+        '<(libjingle_orig)/source/talk/base/stringdigest.h',
+        '<(libjingle_orig)/source/talk/base/stringencode.cc',
+        '<(libjingle_orig)/source/talk/base/stringencode.h',
+        '<(libjingle_orig)/source/talk/base/stringutils.cc',
+        '<(libjingle_orig)/source/talk/base/stringutils.h',
+        '<(libjingle_orig)/source/talk/base/task.cc',
+        '<(libjingle_orig)/source/talk/base/task.h',
+        '<(libjingle_orig)/source/talk/base/taskparent.cc',
+        '<(libjingle_orig)/source/talk/base/taskparent.h',
+        '<(libjingle_orig)/source/talk/base/taskrunner.cc',
+        '<(libjingle_orig)/source/talk/base/taskrunner.h',
+        '<(libjingle_orig)/source/talk/base/thread.cc',
+        '<(libjingle_orig)/source/talk/base/thread.h',
+        '<(libjingle_orig)/source/talk/base/time.cc',
+        '<(libjingle_orig)/source/talk/base/time.h',
+        '<(libjingle_orig)/source/talk/base/urlencode.cc',
+        '<(libjingle_orig)/source/talk/base/urlencode.h',
+        '<(libjingle_orig)/source/talk/xmllite/xmlbuilder.cc',
+        '<(libjingle_orig)/source/talk/xmllite/xmlbuilder.h',
+        '<(libjingle_orig)/source/talk/xmllite/xmlconstants.cc',
+        '<(libjingle_orig)/source/talk/xmllite/xmlconstants.h',
+        '<(libjingle_orig)/source/talk/xmllite/xmlelement.cc',
+        '<(libjingle_orig)/source/talk/xmllite/xmlelement.h',
+        '<(libjingle_orig)/source/talk/xmllite/xmlnsstack.cc',
+        '<(libjingle_orig)/source/talk/xmllite/xmlnsstack.h',
+        '<(libjingle_orig)/source/talk/xmllite/xmlparser.cc',
+        '<(libjingle_orig)/source/talk/xmllite/xmlparser.h',
+        '<(libjingle_orig)/source/talk/xmllite/xmlprinter.cc',
+        '<(libjingle_orig)/source/talk/xmllite/xmlprinter.h',
+        '<(libjingle_orig)/source/talk/xmpp/asyncsocket.h',
+        '<(libjingle_orig)/source/talk/xmpp/constants.cc',
+        '<(libjingle_orig)/source/talk/xmpp/constants.h',
+        '<(libjingle_orig)/source/talk/xmpp/jid.cc',
+        '<(libjingle_orig)/source/talk/xmpp/jid.h',
+        '<(libjingle_orig)/source/talk/xmpp/plainsaslhandler.h',
+        '<(libjingle_orig)/source/talk/xmpp/prexmppauth.h',
+        '<(libjingle_orig)/source/talk/xmpp/ratelimitmanager.cc',
+        '<(libjingle_orig)/source/talk/xmpp/ratelimitmanager.h',
+        '<(libjingle_orig)/source/talk/xmpp/saslcookiemechanism.h',
+        '<(libjingle_orig)/source/talk/xmpp/saslhandler.h',
+        '<(libjingle_orig)/source/talk/xmpp/saslmechanism.cc',
+        '<(libjingle_orig)/source/talk/xmpp/saslmechanism.h',
+        '<(libjingle_orig)/source/talk/xmpp/saslplainmechanism.h',
+        '<(libjingle_orig)/source/talk/xmpp/xmppclient.cc',
+        '<(libjingle_orig)/source/talk/xmpp/xmppclient.h',
+        '<(libjingle_orig)/source/talk/xmpp/xmppclientsettings.h',
+        '<(libjingle_orig)/source/talk/xmpp/xmppengine.h',
+        '<(libjingle_orig)/source/talk/xmpp/xmppengineimpl.cc',
+        '<(libjingle_orig)/source/talk/xmpp/xmppengineimpl.h',
+        '<(libjingle_orig)/source/talk/xmpp/xmppengineimpl_iq.cc',
+        '<(libjingle_orig)/source/talk/xmpp/xmpplogintask.cc',
+        '<(libjingle_orig)/source/talk/xmpp/xmpplogintask.h',
+        '<(libjingle_orig)/source/talk/xmpp/xmppstanzaparser.cc',
+        '<(libjingle_orig)/source/talk/xmpp/xmppstanzaparser.h',
+        '<(libjingle_orig)/source/talk/xmpp/xmpptask.cc',
+        '<(libjingle_orig)/source/talk/xmpp/xmpptask.h',
       ],
       'conditions': [
         ['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',
+            '<(libjingle_orig)/source/talk/base/schanneladapter.cc',
+            '<(libjingle_orig)/source/talk/base/schanneladapter.h',
+            '<(libjingle_orig)/source/talk/base/win32.h',
+            '<(libjingle_orig)/source/talk/base/win32.cc',
+            '<(libjingle_orig)/source/talk/base/win32filesystem.cc',
+            '<(libjingle_orig)/source/talk/base/win32filesystem.h',
+            '<(libjingle_orig)/source/talk/base/win32window.h',
+            '<(libjingle_orig)/source/talk/base/win32window.cc',
+            '<(libjingle_orig)/source/talk/base/win32securityerrors.cc',
+            '<(libjingle_orig)/source/talk/base/winfirewall.cc',
+            '<(libjingle_orig)/source/talk/base/winfirewall.h',
+            '<(libjingle_orig)/source/talk/base/winping.cc',
+            '<(libjingle_orig)/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',
+            '<(libjingle_orig)/source/talk/base/latebindingsymboltable.cc',
+            '<(libjingle_orig)/source/talk/base/latebindingsymboltable.h',
+            '<(libjingle_orig)/source/talk/base/sslstreamadapter.cc',
+            '<(libjingle_orig)/source/talk/base/sslstreamadapter.h',
+            '<(libjingle_orig)/source/talk/base/unixfilesystem.cc',
+            '<(libjingle_orig)/source/talk/base/unixfilesystem.h',
           ],
         }],
         ['OS=="linux"', {
           'sources': [
-            'source/talk/base/linux.cc',
-            'source/talk/base/linux.h',
+            '<(libjingle_orig)/source/talk/base/linux.cc',
+            '<(libjingle_orig)/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',
+            '<(libjingle_orig)/source/talk/base/macconversion.cc',
+            '<(libjingle_orig)/source/talk/base/macconversion.h',
+            '<(libjingle_orig)/source/talk/base/macutils.cc',
+            '<(libjingle_orig)/source/talk/base/macutils.h',
           ],
         }],
-        ['inside_chromium_build==1', {
-          'dependencies': [
-            'source/talk/third_party/jsoncpp/jsoncpp.gyp:jsoncpp',
-          ],
-        }, {
-          'dependencies': [
-            '../../third_party/jsoncpp/jsoncpp.gyp:jsoncpp',
-          ],
-        } ],  # inside_chromium_build
+      ],
+      'dependencies': [
+        '../../third_party/jsoncpp/jsoncpp.gyp:jsoncpp',
       ],
     },
     # This has to be is a separate project due to a bug in MSVS:
@@ -402,133 +396,133 @@
       '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.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/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/videocommon.h',
-        'source/talk/session/phone/voicechannel.h',
-        'source/talk/session/phone/webrtccommon.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',
+        '<(libjingle_orig)/source/talk/p2p/base/candidate.h',
+        '<(libjingle_orig)/source/talk/p2p/base/common.h',
+        '<(libjingle_orig)/source/talk/p2p/base/constants.cc',
+        '<(libjingle_orig)/source/talk/p2p/base/constants.h',
+        '<(libjingle_orig)/source/talk/p2p/base/p2ptransport.cc',
+        '<(libjingle_orig)/source/talk/p2p/base/p2ptransport.h',
+        '<(libjingle_orig)/source/talk/p2p/base/p2ptransportchannel.cc',
+        '<(libjingle_orig)/source/talk/p2p/base/p2ptransportchannel.h',
+        '<(libjingle_orig)/source/talk/p2p/base/port.cc',
+        '<(libjingle_orig)/source/talk/p2p/base/port.h',
+        '<(libjingle_orig)/source/talk/p2p/base/portallocator.h',
+        '<(libjingle_orig)/source/talk/p2p/base/pseudotcp.cc',
+        '<(libjingle_orig)/source/talk/p2p/base/pseudotcp.h',
+        '<(libjingle_orig)/source/talk/p2p/base/rawtransport.cc',
+        '<(libjingle_orig)/source/talk/p2p/base/rawtransport.h',
+        '<(libjingle_orig)/source/talk/p2p/base/rawtransportchannel.cc',
+        '<(libjingle_orig)/source/talk/p2p/base/rawtransportchannel.h',
+        '<(libjingle_orig)/source/talk/p2p/base/relayport.cc',
+        '<(libjingle_orig)/source/talk/p2p/base/relayport.h',
+        '<(libjingle_orig)/source/talk/p2p/base/session.cc',
+        '<(libjingle_orig)/source/talk/p2p/base/session.h',
+        '<(libjingle_orig)/source/talk/p2p/base/sessionclient.h',
+        '<(libjingle_orig)/source/talk/p2p/base/sessiondescription.cc',
+        '<(libjingle_orig)/source/talk/p2p/base/sessiondescription.h',
+        '<(libjingle_orig)/source/talk/p2p/base/sessionid.h',
+        '<(libjingle_orig)/source/talk/p2p/base/sessionmanager.cc',
+        '<(libjingle_orig)/source/talk/p2p/base/sessionmanager.h',
+        '<(libjingle_orig)/source/talk/p2p/base/sessionmessages.cc',
+        '<(libjingle_orig)/source/talk/p2p/base/sessionmessages.h',
+        '<(libjingle_orig)/source/talk/p2p/base/parsing.cc',
+        '<(libjingle_orig)/source/talk/p2p/base/parsing.h',
+        '<(libjingle_orig)/source/talk/p2p/base/stun.cc',
+        '<(libjingle_orig)/source/talk/p2p/base/stun.h',
+        '<(libjingle_orig)/source/talk/p2p/base/stunport.cc',
+        '<(libjingle_orig)/source/talk/p2p/base/stunport.h',
+        '<(libjingle_orig)/source/talk/p2p/base/stunrequest.cc',
+        '<(libjingle_orig)/source/talk/p2p/base/stunrequest.h',
+        '<(libjingle_orig)/source/talk/p2p/base/tcpport.cc',
+        '<(libjingle_orig)/source/talk/p2p/base/tcpport.h',
+        '<(libjingle_orig)/source/talk/p2p/base/transport.cc',
+        '<(libjingle_orig)/source/talk/p2p/base/transport.h',
+        '<(libjingle_orig)/source/talk/p2p/base/transportchannel.cc',
+        '<(libjingle_orig)/source/talk/p2p/base/transportchannel.h',
+        '<(libjingle_orig)/source/talk/p2p/base/transportchannelimpl.h',
+        '<(libjingle_orig)/source/talk/p2p/base/transportchannelproxy.cc',
+        '<(libjingle_orig)/source/talk/p2p/base/transportchannelproxy.h',
+        '<(libjingle_orig)/source/talk/p2p/base/udpport.cc',
+        '<(libjingle_orig)/source/talk/p2p/base/udpport.h',
+        '<(libjingle_orig)/source/talk/p2p/client/basicportallocator.cc',
+        '<(libjingle_orig)/source/talk/p2p/client/basicportallocator.h',
+        '<(libjingle_orig)/source/talk/p2p/client/httpportallocator.cc',
+        '<(libjingle_orig)/source/talk/p2p/client/httpportallocator.h',
+        '<(libjingle_orig)/source/talk/p2p/client/sessionmanagertask.h',
+        '<(libjingle_orig)/source/talk/p2p/client/sessionsendtask.h',
+        '<(libjingle_orig)/source/talk/p2p/client/socketmonitor.cc',
+        '<(libjingle_orig)/source/talk/p2p/client/socketmonitor.h',
+        '<(libjingle_orig)/source/talk/session/phone/audiomonitor.cc',
+        '<(libjingle_orig)/source/talk/session/phone/audiomonitor.h',
+        '<(libjingle_orig)/source/talk/session/phone/call.cc',
+        '<(libjingle_orig)/source/talk/session/phone/call.h',
+        '<(libjingle_orig)/source/talk/session/phone/channel.cc',
+        '<(libjingle_orig)/source/talk/session/phone/channel.h',
+        '<(libjingle_orig)/source/talk/session/phone/channelmanager.cc',
+        '<(libjingle_orig)/source/talk/session/phone/channelmanager.h',
+        '<(libjingle_orig)/source/talk/session/phone/codec.cc',
+        '<(libjingle_orig)/source/talk/session/phone/codec.h',
+        '<(libjingle_orig)/source/talk/session/phone/cryptoparams.h',
+        '<(libjingle_orig)/source/talk/session/phone/currentspeakermonitor.cc',
+        '<(libjingle_orig)/source/talk/session/phone/currentspeakermonitor.h',
+        '<(libjingle_mods)/source/talk/session/phone/devicemanager.cc',
+        '<(libjingle_mods)/source/talk/session/phone/devicemanager.h',
+        '<(libjingle_orig)/source/talk/session/phone/filemediaengine.cc',
+        '<(libjingle_orig)/source/talk/session/phone/filemediaengine.h',   
+        '<(libjingle_orig)/source/talk/session/phone/mediachannel.h',
+        '<(libjingle_orig)/source/talk/session/phone/mediaengine.cc',
+        '<(libjingle_orig)/source/talk/session/phone/mediaengine.h',
+        '<(libjingle_orig)/source/talk/session/phone/mediamessages.cc',
+        '<(libjingle_orig)/source/talk/session/phone/mediamessages.h',
+        '<(libjingle_orig)/source/talk/session/phone/mediamonitor.cc',
+        '<(libjingle_orig)/source/talk/session/phone/mediamonitor.h',
+        '<(libjingle_orig)/source/talk/session/phone/mediasessionclient.cc',
+        '<(libjingle_orig)/source/talk/session/phone/mediasessionclient.h',
+        '<(libjingle_orig)/source/talk/session/phone/mediasink.h',
+        '<(libjingle_orig)/source/talk/session/phone/rtcpmuxfilter.cc',
+        '<(libjingle_orig)/source/talk/session/phone/rtcpmuxfilter.h',        
+        '<(libjingle_orig)/source/talk/session/phone/rtpdump.cc',
+        '<(libjingle_orig)/source/talk/session/phone/rtpdump.h',
+        '<(libjingle_orig)/source/talk/session/phone/rtputils.cc',
+        '<(libjingle_orig)/source/talk/session/phone/rtputils.h',
+        '<(libjingle_orig)/source/talk/session/phone/soundclip.cc',
+        '<(libjingle_orig)/source/talk/session/phone/soundclip.h',
+        '<(libjingle_mods)/source/talk/session/phone/srtpfilter.cc',
+        '<(libjingle_orig)/source/talk/session/phone/srtpfilter.h',
+        '<(libjingle_orig)/source/talk/session/phone/videocommon.h',
+        '<(libjingle_orig)/source/talk/session/phone/voicechannel.h',
+        '<(libjingle_mods)/source/talk/session/phone/webrtccommon.h',
+        '<(libjingle_mods)/source/talk/session/phone/webrtcvideoengine.cc',
+        '<(libjingle_mods)/source/talk/session/phone/webrtcvideoengine.h',
+        '<(libjingle_mods)/source/talk/session/phone/webrtcvideoframe.cc',
+        '<(libjingle_mods)/source/talk/session/phone/webrtcvideoframe.h',
+        '<(libjingle_mods)/source/talk/session/phone/webrtcvie.h',
+        '<(libjingle_mods)/source/talk/session/phone/webrtcvoe.h',
+        '<(libjingle_mods)/source/talk/session/phone/webrtcvoiceengine.cc',
+        '<(libjingle_mods)/source/talk/session/phone/webrtcvoiceengine.h',
+        '<(libjingle_orig)/source/talk/session/tunnel/pseudotcpchannel.cc',
+        '<(libjingle_orig)/source/talk/session/tunnel/pseudotcpchannel.h',
+        '<(libjingle_orig)/source/talk/session/tunnel/tunnelsessionclient.cc',
+        '<(libjingle_orig)/source/talk/session/tunnel/tunnelsessionclient.h',
       ],
       'conditions': [
         ['OS=="win"', {
           'sources': [
-            'source/talk/session/phone/gdivideorenderer.cc',
-            'source/talk/session/phone/gdivideorenderer.h',
+            '<(libjingle_orig)/source/talk/session/phone/gdivideorenderer.cc',
+            '<(libjingle_orig)/source/talk/session/phone/gdivideorenderer.h',
           ],
         }],   
         ['OS=="linux"', {
           'sources': [
-            '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/v4llookup.cc',
-            'source/talk/session/phone/v4llookup.h',
+            '<(libjingle_orig)/source/talk/session/phone/gtkvideorenderer.cc',
+            '<(libjingle_orig)/source/talk/session/phone/gtkvideorenderer.h', 
+            '<(libjingle_orig)/source/talk/session/phone/libudevsymboltable.cc',
+            '<(libjingle_orig)/source/talk/session/phone/libudevsymboltable.h',
+            '<(libjingle_orig)/source/talk/session/phone/v4llookup.cc',
+            '<(libjingle_orig)/source/talk/session/phone/v4llookup.h',
           ],
           'include_dirs': [
-            'source/talk/third_party/libudev',
+            '<(libjingle_orig)/source/talk/third_party/libudev',
           ],
           'cflags': [
              '<!@(pkg-config --cflags gtk+-2.0)',
@@ -536,12 +530,12 @@
         }],        
         ['inside_chromium_build==1', {
           'dependencies': [
-            '../webrtc/modules/audio_device/main/source/audio_device.gyp:audio_device',
-            '../webrtc/modules/video_capture/main/source/video_capture.gyp:video_capture_module',
-            '../webrtc/modules/video_render/main/source/video_render.gyp:video_render_module',
-            '../webrtc/system_wrappers/source/system_wrappers.gyp:system_wrappers',
-            '../webrtc/video_engine/main/source/video_engine_core.gyp:video_engine_core',
-            '../webrtc/voice_engine/main/source/voice_engine_core.gyp:voice_engine_core',
+            '../../third_party/webrtc/modules/audio_device/main/source/audio_device.gyp:audio_device',
+            '../../third_party/webrtc/modules/video_capture/main/source/video_capture.gyp:video_capture_module',
+            '../../third_party/webrtc/modules/video_render/main/source/video_render.gyp:video_render_module',
+            '../../third_party/webrtc/system_wrappers/source/system_wrappers.gyp:system_wrappers',
+            '../../third_party/webrtc/video_engine/main/source/video_engine_core.gyp:video_engine_core',
+            '../../third_party/webrtc/voice_engine/main/source/voice_engine_core.gyp:voice_engine_core',
             'libjingle',
           ],
         }, {
@@ -560,41 +554,33 @@
     # seperate project for app
     {
       'target_name': 'libjingle_app',
-      'variables': {
-        'conditions': [
-          ['inside_chromium_build==1', {
-            'overrides': 'overrides',
-          },{
-            'overrides': 'source',
-          }],
-        ],
-      },
       'type': '<(library)',
       'sources': [
-        'source/talk/app/webrtc/peerconnection.cc',
-        'source/talk/app/webrtc/peerconnection.h',
-        'source/talk/app/webrtc/peerconnectionimpl_callbacks.h',
-        'source/talk/app/webrtc/peerconnection_impl.cc',
-        'source/talk/app/webrtc/peerconnection_impl.h',
-        'source/talk/app/webrtc/webrtcsession.cc',
-        'source/talk/app/webrtc/webrtcsession.h',
-        'source/talk/app/webrtc/webrtc_json.cc',
-        'source/talk/app/webrtc/webrtc_json.h',                  
+        '<(libjingle_mods)/source/talk/app/webrtc/peerconnection.cc',
+        '<(libjingle_mods)/source/talk/app/webrtc/peerconnection.h',
+        '<(libjingle_mods)/source/talk/app/webrtc/peerconnectionimpl_callbacks.h',
+        '<(libjingle_mods)/source/talk/app/webrtc/peerconnection_impl.cc',
+        '<(libjingle_mods)/source/talk/app/webrtc/peerconnection_impl.h',
+        '<(libjingle_mods)/source/talk/app/webrtc/webrtcsession.cc',
+        '<(libjingle_mods)/source/talk/app/webrtc/webrtcsession.h',
+        '<(libjingle_mods)/source/talk/app/webrtc/webrtc_json.cc',
+        '<(libjingle_mods)/source/talk/app/webrtc/webrtc_json.h',                  
+      ],
+      'dependencies': [
+        '../../third_party/jsoncpp/jsoncpp.gyp:jsoncpp',
       ],
       'conditions': [
         ['inside_chromium_build==1', {        
           'dependencies': [
-            '../webrtc/modules/video_capture/main/source/video_capture.gyp:video_capture_module',
-            '../webrtc/modules/video_render/main/source/video_render.gyp:video_render_module',
-            '../webrtc/video_engine/main/source/video_engine_core.gyp:video_engine_core',
-            '../webrtc/voice_engine/main/source/voice_engine_core.gyp:voice_engine_core',
-            '../webrtc/system_wrappers/source/system_wrappers.gyp:system_wrappers',
+            '../../third_party/webrtc/modules/video_capture/main/source/video_capture.gyp:video_capture_module',
+            '../../third_party/webrtc/modules/video_render/main/source/video_render.gyp:video_render_module',
+            '../../third_party/webrtc/video_engine/main/source/video_engine_core.gyp:video_engine_core',
+            '../../third_party/webrtc/voice_engine/main/source/voice_engine_core.gyp:voice_engine_core',
+            '../../third_party/webrtc/system_wrappers/source/system_wrappers.gyp:system_wrappers',
             'libjingle_p2p',
-            'source/talk/third_party/jsoncpp/jsoncpp.gyp:jsoncpp',
           ],          
         }, {
           'dependencies': [
-            '../../third_party/jsoncpp/jsoncpp.gyp:jsoncpp',
             '../../src/modules/video_capture/main/source/video_capture.gyp:video_capture_module',
             '../../src/modules/video_render/main/source/video_render.gyp:video_render_module',
             '../../src/video_engine/main/source/video_engine_core.gyp:video_engine_core',
@@ -606,22 +592,22 @@
         ['peer_connection_dev==1', {
           'sources': [
             '<(overrides)/talk/app/webrtc/scoped_refptr.h',
-            'source/talk/app/webrtc/audio_device_dev.cc',
-            'source/talk/app/webrtc/local_audio_track_impl_dev.cc',
-            'source/talk/app/webrtc/local_stream_dev.h',
-            'source/talk/app/webrtc/local_stream_dev.cc',
-            'source/talk/app/webrtc/local_video_track_impl_dev.cc',
-            'source/talk/app/webrtc/peerconnection_dev.h',
-            'source/talk/app/webrtc/peerconnection_impl_dev.cc',
-            'source/talk/app/webrtc/peerconnection_impl_dev.h',
-            'source/talk/app/webrtc/peerconnectionmanager.cc',
-            'source/talk/app/webrtc/peerconnectionmanager.h',
-            'source/talk/app/webrtc/peerconnectiontransport.cc',
-            'source/talk/app/webrtc/peerconnectiontransport.h',
-            'source/talk/app/webrtc/ref_count.h',
-            'source/talk/app/webrtc/stream_dev.h',
-            'source/talk/app/webrtc/video_device_dev.cc',
-            'source/talk/app/webrtc/video_renderer_dev.cc',
+            '<(libjingle_mods)/source/talk/app/webrtc/audio_device_dev.cc',
+            '<(libjingle_mods)/source/talk/app/webrtc/local_audio_track_impl_dev.cc',
+            '<(libjingle_mods)/source/talk/app/webrtc/local_stream_dev.h',
+            '<(libjingle_mods)/source/talk/app/webrtc/local_stream_dev.cc',
+            '<(libjingle_mods)/source/talk/app/webrtc/local_video_track_impl_dev.cc',
+            '<(libjingle_mods)/source/talk/app/webrtc/peerconnection_dev.h',
+            '<(libjingle_mods)/source/talk/app/webrtc/peerconnection_impl_dev.cc',
+            '<(libjingle_mods)/source/talk/app/webrtc/peerconnection_impl_dev.h',
+            '<(libjingle_mods)/source/talk/app/webrtc/peerconnectionmanager.cc',
+            '<(libjingle_mods)/source/talk/app/webrtc/peerconnectionmanager.h',
+            '<(libjingle_mods)/source/talk/app/webrtc/peerconnectiontransport.cc',
+            '<(libjingle_mods)/source/talk/app/webrtc/peerconnectiontransport.h',
+            '<(libjingle_mods)/source/talk/app/webrtc/ref_count.h',
+            '<(libjingle_mods)/source/talk/app/webrtc/stream_dev.h',
+            '<(libjingle_mods)/source/talk/app/webrtc/video_device_dev.cc',
+            '<(libjingle_mods)/source/talk/app/webrtc/video_renderer_dev.cc',
           ],
         }], # peer_connection_dev
       ],  # conditions
@@ -632,7 +618,7 @@
         ['peer_connection_dev==1 and OS=="linux"', {
           'type': 'executable',
           'sources': [
-            'source/talk/app/webrtc/peerconnection_client_dev.cc',
+            '<(libjingle_mods)/source/talk/app/webrtc/peerconnection_client_dev.cc',
           ],
           'libraries': [
             '-lXext',
diff --git a/webrtc.gyp b/webrtc.gyp
index 36d40641b0..dd9ee91baa 100644
--- a/webrtc.gyp
+++ b/webrtc.gyp
@@ -65,9 +65,10 @@
             },
           },
           'dependencies': [
-            'third_party/libjingle/libjingle.gyp:libjingle_app',
+            'third_party_mods/libjingle/libjingle.gyp:libjingle_app',
           ],
           'include_dirs': [
+            'third_party_mods/libjingle/source',
             'third_party/libjingle/source',
           ],
         },