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

trunk/src/third_party/libjingle/overrides/initialize_module.cc

Index: trunk/src/third_party/libjingle/overrides/initialize_module.cc
===================================================================
--- trunk/src/third_party/libjingle/overrides/initialize_module.cc	(revision 208284)
+++ trunk/src/third_party/libjingle/overrides/initialize_module.cc	(working copy)
@@ -20,7 +20,7 @@
 #define ALLOC_EXPORT __attribute__((visibility("default")))
 #endif
 
-#if !defined(OS_MACOSX) && !defined(OS_ANDROID)
+#if !defined(OS_MACOSX)
 // These are used by our new/delete overrides in
 // allocator_shim/allocator_proxy.cc
 AllocateFunction g_alloc = NULL;
@@ -44,7 +44,7 @@
 // Called from init_webrtc.cc.
 ALLOC_EXPORT
 bool InitializeModule(const CommandLine& command_line,
-#if !defined(OS_MACOSX) && !defined(OS_ANDROID)
+#if !defined(OS_MACOSX)
                       AllocateFunction alloc,
                       DellocateFunction dealloc,
 #endif
@@ -53,7 +53,7 @@
                       webrtc::AddTraceEventPtr trace_add_trace_event,
                       CreateWebRtcMediaEngineFunction* create_media_engine,
                       DestroyWebRtcMediaEngineFunction* destroy_media_engine) {
-#if !defined(OS_MACOSX) && !defined(OS_ANDROID)
+#if !defined(OS_MACOSX)
   g_alloc = alloc;
   g_dealloc = dealloc;
 #endif