summaryrefslogtreecommitdiffstats
path: root/third_party/libjingle/overrides/init_webrtc.cc
diff options
context:
space:
mode:
Diffstat (limited to 'third_party/libjingle/overrides/init_webrtc.cc')
-rw-r--r--third_party/libjingle/overrides/init_webrtc.cc6
1 files changed, 5 insertions, 1 deletions
diff --git a/third_party/libjingle/overrides/init_webrtc.cc b/third_party/libjingle/overrides/init_webrtc.cc
index ba28478..5436345 100644
--- a/third_party/libjingle/overrides/init_webrtc.cc
+++ b/third_party/libjingle/overrides/init_webrtc.cc
@@ -61,6 +61,10 @@ static base::FilePath GetLibPeerConnectionPath() {
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 @@ bool InitializeWebRtcModule() {
// 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(),