Revert 107031 - Breaks those on NewGit due to http://crbug.com/101448

third_party/libjingle/libjingle.gyp

 # Copyright (c) 2011 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.
 
 {
   'variables': {
     'no_libjingle_logging%': 0,
   },
   'includes': [
     '../../build/win_precompile.gypi',
   ],
   '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_VIDEO',
       'HAVE_WEBRTC_VOICE',
-      'NO_SOUND_SYSTEM',
     ],
     'configurations': {
       'Debug': {
         'defines': [
           # TODO(sergeyu): Fix libjingle to use NDEBUG instead of
           # _DEBUG and remove this define. See below as well.
           '_DEBUG',
         ],
       }
     },
     'include_dirs': [
       './overrides',
       './source',
     ],
     'dependencies': [
-      '<(DEPTH)/base/base.gyp:base',
-      '<(DEPTH)/net/net.gyp:net',
-      '<(DEPTH)/third_party/expat/expat.gyp:expat',
+      '../expat/expat.gyp:expat',
+      '../../base/base.gyp:base',
+      '../../net/net.gyp:net',
     ],
     'export_dependent_settings': [
-      '<(DEPTH)/third_party/expat/expat.gyp:expat',
+      '../expat/expat.gyp:expat',
     ],
     'direct_dependent_settings': {
       'include_dirs': [
         './overrides',
         './source',
       ],
       'defines': [
         'FEATURE_ENABLE_SSL',
         'FEATURE_ENABLE_VOICEMAIL',
         'EXPAT_RELATIVE_PATH',
-        'JSONCPP_RELATIVE_PATH',
         'WEBRTC_RELATIVE_PATH',
-        'NO_SOUND_SYSTEM',
       ],
       'conditions': [
         ['OS=="win"', {
           'link_settings': {
             'libraries': [
               '-lsecur32.lib',
               '-lcrypt32.lib',
               '-liphlpapi.lib',
             ],
           },
@@ skipping 138 matching lines @@
         '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',
@@ skipping 44 matching lines @@
         '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',
@@ skipping 49 matching lines @@
         ['os_posix == 1', {
           'sources': [
             '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/latebindingsymboltable.cc',
-            'source/talk/base/latebindingsymboltable.h',
             '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',
-      ],
-      'export_dependent_settings': [
-        '<(DEPTH)/third_party/jsoncpp/jsoncpp.gyp:jsoncpp',
-      ],
     },  # target libjingle
     # 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',
@@ skipping 59 matching lines @@
       ],
       'dependencies': [
         'libjingle',
       ],
     },  # target libjingle_p2p
     {
       'target_name': 'libjingle_peerconnection',
       'type': 'static_library',
       'sources': [        
         'source/talk/app/webrtc/peerconnection.h',
+        'source/talk/app/webrtc/peerconnectionfactory.h',
         'source/talk/app/webrtc/peerconnectionfactory.cc',
-        'source/talk/app/webrtc/peerconnectionfactory.h',
-        'source/talk/app/webrtc/peerconnectionimpl.cc',
-        'source/talk/app/webrtc/peerconnectionimpl.h',
         'source/talk/app/webrtc/peerconnectionproxy.cc',
         'source/talk/app/webrtc/peerconnectionproxy.h',
-        'source/talk/app/webrtc/webrtcsession.cc',
-        'source/talk/app/webrtc/webrtcsession.h',
-        'source/talk/app/webrtc/webrtcjson.cc',
-        'source/talk/app/webrtc/webrtcjson.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/videocommon.h',
         'source/talk/session/phone/voicechannel.h',
         'source/talk/session/phone/webrtccommon.h',
         'source/talk/session/phone/webrtcpassthroughrender.cc',
-        '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',
       ],
       'dependencies': [
-        '<(DEPTH)/third_party/webrtc/modules/modules.gyp:video_capture_module',
-        '<(DEPTH)/third_party/webrtc/modules/modules.gyp:video_render_module',
-        '<(DEPTH)/third_party/webrtc/video_engine/video_engine.gyp:video_engine_core',
-        '<(DEPTH)/third_party/webrtc/voice_engine/voice_engine.gyp:voice_engine_core',
-        '<(DEPTH)/third_party/webrtc/system_wrappers/source/system_wrappers.gyp:system_wrappers',
-        'libjingle',
+        '../../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',
       ],          
     },  # target libjingle_peerconnection
   ],
 }