Revert 198675 "Reland 198495 for Windows."

trunk/src/third_party/libjingle/libjingle.gyp

Index: trunk/src/third_party/libjingle/libjingle.gyp
===================================================================
--- trunk/src/third_party/libjingle/libjingle.gyp	(revision 198806)
+++ trunk/src/third_party/libjingle/libjingle.gyp	(working copy)
@@ -11,13 +11,8 @@
     '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': [
@@ -770,7 +765,8 @@
             '<(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',
@@ -875,7 +871,8 @@
             'libjingle_webrtc',
           ],
           'conditions': [
-            ['libpeer_target_type!="static_library"', {
+            ['libpeer_allocator_shim==1 and '
+             'libpeer_target_type!="static_library"', {
               'sources': [
                 'overrides/initialize_module.cc',
               ],