Revert 198675 "Reland 198495 for Windows."

trunk/src/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",
-    'conditions': [
-      ['OS=="win"', {  # TODO(tommi): Enable for mac and linux.
-        'libpeer_target_type%': 'loadable_module',
-      }, {
-        'libpeer_target_type%': 'static_library',
-      }],
-    ],
+    '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',
       'JSONCPP_RELATIVE_PATH',
@@ skipping 732 matching lines @@
             '<(libjingle_source)/talk/session/media/ssrcmuxfilter.h',
             '<(libjingle_source)/talk/session/media/typingmonitor.cc',
             '<(libjingle_source)/talk/session/media/typingmonitor.h',
             '<(libjingle_source)/talk/session/media/voicechannel.h',
             '<(libjingle_source)/talk/session/tunnel/pseudotcpchannel.cc',
             '<(libjingle_source)/talk/session/tunnel/pseudotcpchannel.h',
             '<(libjingle_source)/talk/session/tunnel/tunnelsessionclient.cc',
             '<(libjingle_source)/talk/session/tunnel/tunnelsessionclient.h',
           ],
           'conditions': [
-            ['libpeer_target_type!="static_library" and OS!="mac"', {
+            ['libpeer_allocator_shim==1 and '
+             'libpeer_target_type!="static_library" and OS!="mac"', {
               'sources': [
                 'overrides/allocator_shim/allocator_stub.cc',
                 'overrides/allocator_shim/allocator_stub.h',
               ],
             }],
             ['enabled_libjingle_device_manager==1', {
               'sources!': [
                 '<(libjingle_source)/talk/media/devices/dummydevicemanager.cc',
                 '<(libjingle_source)/talk/media/devices/dummydevicemanager.h',
               ],
@@ skipping 84 matching lines @@
             '<(libjingle_source)/talk/media/webrtc/webrtcvoiceengine.h',
           ],
           'dependencies': [
             '<(DEPTH)/third_party/webrtc/system_wrappers/source/system_wrappers.gyp:system_wrappers',
             '<(DEPTH)/third_party/webrtc/video_engine/video_engine.gyp:video_engine_core',
             '<(DEPTH)/third_party/webrtc/voice_engine/voice_engine.gyp:voice_engine_core',
             '<@(libjingle_peerconnection_additional_deps)',
             'libjingle_webrtc',
           ],
           'conditions': [
-            ['libpeer_target_type!="static_library"', {
+            ['libpeer_allocator_shim==1 and '
+             'libpeer_target_type!="static_library"', {
               'sources': [
                 'overrides/initialize_module.cc',
               ],
               'conditions': [
                 ['OS!="mac"', {
                   'sources': [
                     'overrides/allocator_shim/allocator_proxy.cc',
                   ],
                 }],
               ],
@@ skipping 31 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
       ],
     }],
   ],
 }