Revert "Update webrtc&libjingle 6774:6799."

third_party/libjingle/libjingle.gyp

 # 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.
 
 {
   'includes': [
     '../../build/win_precompile.gypi',
   ],
   'variables': {
     'enabled_libjingle_device_manager%': 0,
     'libjingle_additional_deps%': [],
     'libjingle_peerconnection_additional_deps%': [],
     'libjingle_source%': "source",
     'libpeer_target_type%': 'static_library',
     'libpeer_allocator_shim%': 0,
   },
   'target_defaults': {
     'defines': [
       'EXPAT_RELATIVE_PATH',
       'FEATURE_ENABLE_SSL',
       'GTEST_RELATIVE_PATH',
       'HAVE_SRTP',
       'HAVE_WEBRTC_VIDEO',
       'HAVE_WEBRTC_VOICE',
-      'LOGGING_INSIDE_WEBRTC',
+      'LOGGING_INSIDE_LIBJINGLE',
       'NO_MAIN_THREAD_WRAPPING',
       'NO_SOUND_SYSTEM',
       'SRTP_RELATIVE_PATH',
       'USE_WEBRTC_DEV_BRANCH',
       'ENABLE_EXTERNAL_AUTH',
     ],
     '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',
+      './<(libjingle_source)',
       '../../third_party/webrtc/overrides',
-      './<(libjingle_source)',
       '../..',
       '../../testing/gtest/include',
       '../../third_party',
       '../../third_party/libyuv/include',
       '../../third_party/usrsctp',
+      '../../third_party/webrtc',
     ],
     'dependencies': [
       '<(DEPTH)/base/base.gyp:base',
       '<(DEPTH)/net/net.gyp:net',
       '<(DEPTH)/third_party/expat/expat.gyp:expat',
     ],
     'export_dependent_settings': [
       '<(DEPTH)/third_party/expat/expat.gyp:expat',
     ],
     'direct_dependent_settings': {
       'include_dirs': [
-        '../../third_party/webrtc/overrides',
         './overrides',
         './<(libjingle_source)',
+        '../../third_party/webrtc/overrides',
         '../..',
         '../../testing/gtest/include',
         '../../third_party',
+        '../../third_party/webrtc',
       ],
       'defines': [
         'FEATURE_ENABLE_SSL',
         'FEATURE_ENABLE_VOICEMAIL',
         'EXPAT_RELATIVE_PATH',
         'GTEST_RELATIVE_PATH',
         'NO_MAIN_THREAD_WRAPPING',
         'NO_SOUND_SYSTEM',
       ],
       'conditions': [
@@ skipping 12 matching lines @@
           ],
           'defines': [
             '_CRT_SECURE_NO_WARNINGS',  # Suppres warnings about _vsnprinf
           ],
           # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
           'msvs_disabled_warnings': [ 4267 ],
         }],
         ['OS=="linux"', {
           'defines': [
             'LINUX',
-            'WEBRTC_LINUX',
           ],
         }],
         ['OS=="mac"', {
           'defines': [
             'OSX',
-            'WEBRTC_MAC',
-          ],
-        }],
-        ['OS=="ios"', {
-          'defines': [
-            'IOS',
-            'WEBRTC_MAC',
-            'WEBRTC_IOS',
-          ],
-        }],
-        ['OS=="win"', {
-          'defines': [
-            'WEBRTC_WIN',
           ],
         }],
         ['OS=="android"', {
           'defines': [
             'ANDROID',
           ],
         }],
         ['os_posix==1', {
           'defines': [
             'POSIX',
-            'WEBRTC_POSIX',
           ],
         }],
         ['os_bsd==1', {
           'defines': [
             'BSD',
           ],
         }],
         ['OS=="openbsd"', {
           'defines': [
             'OPENBSD',
@@ skipping 74 matching lines @@
             '-Wstring-conversion',
           ],
         },
         'cflags!': [
           '-Wstring-conversion',
         ],
       }],
       ['OS=="linux"', {
         'defines': [
           'LINUX',
-          'WEBRTC_LINUX',
         ],
       }],
       ['OS=="mac"', {
         'defines': [
           'OSX',
-          'WEBRTC_MAC',
-        ],
-      }],
-      ['OS=="win"', {
-        'defines': [
-          'WEBRTC_WIN',
         ],
       }],
       ['OS=="ios"', {
         'defines': [
           'IOS',
-          'WEBRTC_MAC',
-          'WEBRTC_IOS',
         ],
       }],
       ['os_posix == 1', {
         'defines': [
           'POSIX',
-          'WEBRTC_POSIX',
         ],
       }],
       ['os_bsd==1', {
         'defines': [
           'BSD',
         ],
       }],
       ['OS=="openbsd"', {
         'defines': [
           'OPENBSD',
         ],
       }],
       ['OS=="freebsd"', {
         'defines': [
           'FREEBSD',
         ],
       }],
     ],
   },
   'targets': [
     {
       'target_name': 'libjingle',
       'type': 'static_library',
       'includes': [ 'libjingle_common.gypi' ],
+      'sources': [
+        'overrides/talk/base/basictypes.h',
+        'overrides/talk/base/constructormagic.h',
+        'overrides/talk/base/win32socketinit.cc',
+
+        # Overrides logging.h/.cc because libjingle logging should be done to
+        # the same place as the chromium logging.
+        'overrides/talk/base/logging.cc',
+        'overrides/talk/base/logging.h',
+      ],
       'sources!' : [
         # Compiled as part of libjingle_p2p_constants.
         '<(libjingle_source)/talk/p2p/base/constants.cc',
         '<(libjingle_source)/talk/p2p/base/constants.h',
+
+        # Replaced with logging.cc in the overrides.
+        '<(libjingle_source)/talk/base/logging.h',
+        '<(libjingle_source)/talk/base/logging.cc',
       ],
       'dependencies': [
-        '<(DEPTH)/third_party/webrtc/base/base.gyp:webrtc_base',
         'libjingle_p2p_constants',
         '<@(libjingle_additional_deps)',
       ],
     },  # target libjingle
     # This has to be is a separate project due to a bug in MSVS 2008 and the
     # current toolset on android.  The problem is that we have two files named
     # "constants.cc" and MSVS/android doesn't handle this properly.
     # GYP currently has guards to catch this, so if you want to remove it,
     # run GYP and if GYP has removed the validation check, then we can assume
     # that the toolchains have been fixed (we currently use VS2010 and later,
@@ skipping 227 matching lines @@
                 '<(libjingle_source)/talk/sound/platformsoundsystemfactory.cc',
                 '<(libjingle_source)/talk/sound/platformsoundsystemfactory.h',
                 '<(libjingle_source)/talk/sound/soundsysteminterface.cc',
                 '<(libjingle_source)/talk/sound/soundsysteminterface.h',
                 '<(libjingle_source)/talk/sound/soundsystemproxy.cc',
                 '<(libjingle_source)/talk/sound/soundsystemproxy.h',
               ],
               'conditions': [
                 ['OS=="win"', {
                   'sources': [
+                    '<(libjingle_source)/talk/base/win32window.cc',
+                    '<(libjingle_source)/talk/base/win32window.h',
+                    '<(libjingle_source)/talk/base/win32windowpicker.cc',
+                    '<(libjingle_source)/talk/base/win32windowpicker.h',
                     '<(libjingle_source)/talk/media/devices/win32deviceinfo.cc',
                     '<(libjingle_source)/talk/media/devices/win32devicemanager.cc',
                     '<(libjingle_source)/talk/media/devices/win32devicemanager.h',
                   ],
                 }],
                 ['OS=="linux"', {
                   'sources': [
+                    '<(libjingle_source)/talk/base/linuxwindowpicker.cc',
+                    '<(libjingle_source)/talk/base/linuxwindowpicker.h',
                     '<(libjingle_source)/talk/media/devices/libudevsymboltable.cc',
                     '<(libjingle_source)/talk/media/devices/libudevsymboltable.h',
                     '<(libjingle_source)/talk/media/devices/linuxdeviceinfo.cc',
                     '<(libjingle_source)/talk/media/devices/linuxdevicemanager.cc',
                     '<(libjingle_source)/talk/media/devices/linuxdevicemanager.h',
                     '<(libjingle_source)/talk/media/devices/v4llookup.cc',
                     '<(libjingle_source)/talk/media/devices/v4llookup.h',
                     '<(libjingle_source)/talk/sound/alsasoundsystem.cc',
                     '<(libjingle_source)/talk/sound/alsasoundsystem.h',
                     '<(libjingle_source)/talk/sound/alsasymboltable.cc',
@@ skipping 109 matching lines @@
               # in this directory and not lib.target as will otherwise be
               # the case with make builds.
               'product_dir': '<(PRODUCT_DIR)/lib',
             }],
           ],
         },  # target libpeerconnection
       ],
     }],
   ],
 }