Index: third_party/libjingle/overrides/init_webrtc.cc |
=================================================================== |
--- third_party/libjingle/overrides/init_webrtc.cc (revision 208299) |
+++ third_party/libjingle/overrides/init_webrtc.cc (working copy) |
@@ -61,6 +61,10 @@ |
CHECK(PathService::Get(base::DIR_MODULE, &path)); |
path = path.Append(FILE_PATH_LITERAL("Libraries")) |
.Append(FILE_PATH_LITERAL("libpeerconnection.so")); |
+#elif defined(OS_ANDROID) |
+ base::FilePath path; |
+ CHECK(PathService::Get(base::DIR_MODULE, &path)); |
+ path = path.Append(FILE_PATH_LITERAL("libpeerconnection.so")); |
#else |
base::FilePath path; |
CHECK(PathService::Get(base::DIR_MODULE, &path)); |
@@ -94,7 +98,7 @@ |
// PS: This function is actually implemented in allocator_proxy.cc with the |
// new/delete overrides. |
return initialize_module(*CommandLine::ForCurrentProcess(), |
-#if !defined(OS_MACOSX) |
+#if !defined(OS_MACOSX) && !defined(OS_ANDROID) |
&Allocate, &Dellocate, |
#endif |
logging::GetLogMessageHandler(), |