Revert 208246 "Support using loadable module for libpeerconnecti..."

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,
@@ skipping 880 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',
             '<@(libjingle_peerconnection_additional_deps)',
             'libjingle_webrtc_common',
           ],
           'conditions': [
-            ['libpeer_target_type!="static_library"', {
+            ['libpeer_allocator_shim==1 and '
+             'libpeer_target_type!="static_library"', {
               'sources': [
                 'overrides/initialize_module.cc',
               ],
               'conditions': [
-                ['OS!="mac" and OS!="android"', {
+                ['OS!="mac"', {
                   'sources': [
                     'overrides/allocator_shim/allocator_proxy.cc',
                   ],
                 }],
               ],
             }],
             ['"<(libpeer_target_type)"!="static_library"', {
               # Used to control symbol export/import.
               'defines': [ 'LIBPEERCONNECTION_IMPLEMENTATION=1' ],
             }],
@@ skipping 11 matching lines @@
                 # For compatibility with how we export symbols from this
                 # target on Windows.  This also prevents the linker from
                 # picking up symbols from this target that should be linked
                 # in from other libjingle libs.
                 '-fvisibility=hidden',
               ],
             }],
             ['OS=="mac" and libpeer_target_type!="static_library"', {
               'product_name': 'libpeerconnection',
             }],
-            ['OS=="android" and "<(libpeer_target_type)"=="static_library"', {
+            ['OS=="android"', {
               'standalone_static_library': 1,
             }],
             ['OS=="linux" and libpeer_target_type!="static_library"', {
               # The installer and various tools depend on finding the .so
               # in this directory and not lib.target as will otherwise be
               # the case with make builds.
               'product_dir': '<(PRODUCT_DIR)/lib',
             }],
           ],
         },  # target libpeerconnection
       ],
     }],
   ],
 }